Merged in [7009] from rcross@amsl.com: removed references to old models for shim removal release.

 - Legacy-Id: 7020
Note: SVN reference [7009] has been migrated to Git commit cf81cce

Author: levkowetz

ietf/secr/drafts/email.py

@@ -158,30 +158,6 @@ def get_fullcc_list(draft):
     if draft.shepherd:
         emails[draft.shepherd.email_address()] = '"%s"' % (draft.shepherd.name)
 
-    """    
-    # add wg advisor
-    try:
-        advisor = IETFWG.objects.get(group_acronym=draft.group.acronym_id).area_director
-        if advisor:
-            add_email(emails,advisor.person)
-    except ObjectDoesNotExist:
-        pass
-    # add shepherding ad
-    try:
-        id = IDInternal.objects.get(draft=draft.id_document_tag)
-        add_email(emails,id.job_owner.person)
-    except ObjectDoesNotExist:
-        pass 
-    # add state_change_notice to
-    try:
-        id = IDInternal.objects.get(draft=draft.id_document_tag)
-        for email in id.state_change_notice_to.split(','):
-            if email.strip() not in emails:
-                emails[email.strip()] = ''
-    except ObjectDoesNotExist:
-        pass 
-    """
-    
     # use sort so we get consistently ordered lists
     result_list = []
     for key in sorted(emails):

ietf/secr/drafts/forms.py

@@ -188,7 +188,7 @@ def save(self, force_insert=False, force_update=False, commit=True):
     # field must contain filename of existing draft
     def clean_replaced_by(self):
         name = self.cleaned_data.get('replaced_by', '')
-        if name and not InternetDraft.objects.filter(filename=name):
+        if name and not Document.objects.filter(name=name):
             raise forms.ValidationError("ERROR: Draft does not exist")
         return name
 

ietf/secr/ipradmin/models.py

@@ -1 +1 @@
-from django.db import models
+from ietf.ipr.models import *

ietf/secr/ipradmin/views.py

@@ -67,7 +67,7 @@ def admin_post(request, ipr_id, from_page, command):
         ipr_dtl.save()
 
     #assert False, (ipr_dtl.ipr_id, ipr_dtl.is_pending)
-    redirect_url = '/ipradmin/admin/notify/%s?from=%s' % (ipr_id, from_page)
+    redirect_url = '/secr/ipradmin/admin/notify/%s?from=%s' % (ipr_id, from_page)
 
     return HttpResponseRedirect(redirect_url)
 # end admin_post
@@ -712,7 +712,7 @@ def admin_update(request, ipr_id):
             ipr_detail = ipr_detail_form.save(commit=False)
             if 'update_ipr' in request.POST:
                 if ipr_detail.third_party:
-                    return HttpResponseRedirect('/ipradmin/admin/notify/%s?from=update' % ipr_id)
+                    return HttpResponseRedirect('/secr/ipradmin/admin/notify/%s?from=update' % ipr_id)
                 else:
                     redirect_url = ''
             else: # remove