Disabled changing of acronym, charter lookup by DocAlias, changes to group proxy model so it gets the correct charter

 - Legacy-Id: 3355

Author: Martin Qvist

ietf/idtracker/models.py

@@ -183,6 +183,9 @@ def file_tag(self):
         return "<%s>" % (self.filename_with_rev())
     def filename_with_rev(self):
         return "%s-%s.txt" % (self.filename, self.revision_display())
+    def name(self):
+        # small hack to make model forward-compatible with new schema
+        return self.filename
     def group_acronym(self):
 	return self.group.acronym
     def group_ml_archive(self):
@@ -255,11 +258,11 @@ class PersonOrOrgInfo(models.Model):
     date_created = models.DateField(auto_now_add=True, null=True)
     created_by = models.CharField(blank=True, null=True, max_length=8)
     address_type = models.CharField(blank=True, null=True, max_length=4)
-    def save(self):
+    def save(self, **kwargs):
         self.first_name_key = self.first_name.upper()
         self.middle_initial_key = self.middle_initial.upper()
         self.last_name_key = self.last_name.upper()
-        super(PersonOrOrgInfo, self).save()
+        super(PersonOrOrgInfo, self).save(**kwargs)
     def __str__(self):
         # For django.VERSION 0.96
 	if self.first_name == '' and self.last_name == '':
@@ -273,16 +276,12 @@ def __unicode__(self):
     def email(self, priority=1, type=None):
         name = unicode(self)
         email = ''
-        types = type and [ type ] or [ "INET", "Prim", None ]
-        for type in types:
-            try:
-                if type:
-                    email = self.emailaddress_set.get(priority=priority, type=type).address
-                else:
-                    email = self.emailaddress_set.get(priority=priority).address
-                break
-            except (EmailAddress.DoesNotExist, AssertionError):
-                pass
+        addresses = self.emailaddress_set.filter(address__contains="@").order_by('priority')
+        if addresses:
+            email = addresses[0].address
+            for a in addresses:
+                if a.priority == priority:
+                    email = a.address
 	return (name, email)
     # Added by Sunny Lee to display person's affiliation - 5/26/2007
     def affiliation(self, priority=1):
@@ -410,6 +409,9 @@ def displayname(self):
         return "%s.txt" % ( self.filename() )
     def filename(self):
 	return "rfc%d" % ( self.rfc_number )
+    def name(self):
+        # small hack to make model forward-compatible with new schema
+        return self.filename()
     def revision(self):
 	return "RFC"
     def revision_display(self):
@@ -1137,6 +1139,23 @@ class DocumentWrapper(object):
     def __init__(self, document):
 	self.document = document
 
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    InternetDraftOld = InternetDraft
+    IDInternalOld = IDInternal
+    RfcOld = Rfc
+    BallotInfoOld = BallotInfo
+    IDStateOld = IDState
+    IDSubStateOld = IDSubState
+    AreaOld = Area
+    AcronymOld = Acronym
+    IESGLoginOld = IESGLogin
+    IETFWGOld = IETFWG
+    IRTFOld = IRTF
+    from redesign.doc.proxy import InternetDraft, IDInternal, BallotInfo, Rfc
+    from redesign.name.proxy import IDState, IDSubState
+    from redesign.group.proxy import Area, Acronym, IETFWG, IRTF
+    from redesign.person.proxy import IESGLogin
+
 
 # changes done by convert-096.py:changed maxlength to max_length
 # removed core

ietf/templates/wgrecord/edit_info.html

@@ -54,23 +54,13 @@ <h1>{% if wg %}
     <tr>
       <th>{{ field.label_tag }}:</th>
       <td>{{ field }}
-      {% ifequal field.name "acronym" %}
-	{% ifequal field.errors "error" %}
-        <ul><li>Acronym already in use.</label></li></ul>
-	{% endifequal %}
-	{% ifequal field.errors "warning" %}
-        <ul><li>Acronym previously used. Use anyway? <label><input type="checkbox" name="confirm_acronym" /></label></li></ul>
-	{% endifequal %}
-      {% endifequal %}      
       {% ifequal field.name "ad" %}
       {% if user|in_group:"Area_Director" %}
       <label><input type="checkbox" name="ad" value="{{ login.pk }}" /> Assign to me</label>
       {% endif %}
       {% endifequal %}      
       {% if field.help_text %}<div class="help">{{ field.help_text }}</div>{% endif %}
-      {% ifnotequal field.name "acronym" %}
-        {{ field.errors }}
-      {% endifnotequal %}
+      {{ field.errors }}
       </td>
     </tr>
     {% endfor %}

ietf/wgrecord/tests.py

@@ -38,11 +38,11 @@ def setUp(self, *args, **kwargs):
 class WgFileTestCase(django.test.TestCase):
     def testFileExistence(self):
         print "     Testing if WG charter texts exist locally"
-        fpath = os.path.join(settings.CHARTER_PATH, "charter-ietf-example-01.txt")
+        fpath = os.path.join(settings.CHARTER_PATH, "charter-ietf-core-01.txt")
         if not os.path.exists(fpath):
-            print "\nERROR: exampe charter text not found in "+settings.CHARTER_PATH
+            print "\nERROR: charter text not found in "+settings.CHARTER_PATH
             print "Needed for testing WG record pages."
-            print "Remember to set CHARTER_PATH in settings_local.py\n"
+            print "Remember to set CHARTER_PATH in settings.py\n"
         else:
             print "OK   (seem to exist)"
 

ietf/wgrecord/utils.py

@@ -3,26 +3,76 @@
 
 from datetime import datetime
 from group.models import GroupEvent
-from doc.models import Document
+from doc.models import Document, DocAlias, DocHistory, RelatedDocument, DocumentAuthor
 from ietf.utils.history import find_history_active_at
 
 def set_or_create_charter(wg):
     try:
-        charter = Document.objects.get(name="charter-ietf-" + wg.acronym)
+        charter = Document.objects.get(docalias__name="charter-ietf-%s" % wg.acronym)
     except Document.DoesNotExist:
         charter = Document.objects.create(
-            name="charter-ietf-%s" % wg.acronym,
+            name="charter-ietf-" + wg.acronym,
             time=datetime.now(),
             type_id="charter",
             title=wg.name,
             group=wg,
             abstract=wg.name,
             rev="",
             )
-    wg.charter = charter
-    wg.save()
+        # Create an alias as well
+        DocAlias.objects.create(
+            name = charter.name,
+            document = charter
+            )
+    if wg.charter != charter:
+        wg.charter = charter
+        wg.save()
     return charter
 
+def save_charter_in_history(charter):
+    '''This is a modified save_document_in_history that save the name 
+    as charter-ietf-wgacronym with wgacronym being the current Group
+    acronym. The charter Document may have an old name which is no longer
+    in use'''
+    def get_model_fields_as_dict(obj):
+        return dict((field.name, getattr(obj, field.name))
+                    for field in obj._meta.fields
+                    if field is not obj._meta.pk)
+
+    # copy fields
+    fields = get_model_fields_as_dict(charter)
+    fields["doc"] = charter
+    fields["name"] = 'charter-ietf-%s' % charter.chartered_group.acronym
+    
+    chist = DocHistory(**fields)
+    chist.save()
+
+    # copy many to many
+    for field in charter._meta.many_to_many:
+        if not field.rel.through:
+            # just add the attributes
+            rel = getattr(chist, field.name)
+            for item in getattr(charter, field.name).all():
+                rel.add(item)
+
+    # copy remaining tricky many to many
+    def transfer_fields(obj, HistModel):
+        mfields = get_model_fields_as_dict(item)
+        # map charter -> chist
+        for k, v in mfields.iteritems():
+            if v == charter:
+                mfields[k] = chist
+        HistModel.objects.create(**mfields)
+
+    for item in RelatedDocument.objects.filter(source=charter):
+        transfer_fields(item, RelatedDocHistory)
+
+    for item in DocumentAuthor.objects.filter(document=charter):
+        transfer_fields(item, DocHistoryAuthor)
+                
+    return chist
+
+
 def add_wg_comment(request, wg, text, ballot=None):
     if request:
         login = request.user.get_profile()
@@ -86,7 +136,19 @@ def get_charter_for_revision(charter, r):
         if l != []:
             return l[0]
         else:
-            return charter
+            # Get the lastest history entry
+            l = list(charter.history_set.all().order_by('-time'))
+            if l != []:
+                class FakeHistory(object):
+                    def __init__(self, name, rev, time):
+                        self.name = name
+                        self.rev = rev
+                        self.time = time
+
+                return FakeHistory(l[0].name, charter.rev, charter.time)
+            else:
+                # no history, just return charter
+                return charter
 
 def get_group_for_revision(wg, r):
     if r == None:
@@ -118,6 +180,12 @@ def next_revision(rev):
     else:
         return "%s-00" % (m.group('major'))
 
+def approved_revision(rev):
+    if rev == "":
+        return ""
+    m = re.match(r"(?P<major>[0-9][0-9])(-(?P<minor>[0-9][0-9]))?", rev)
+    return m.group('major')
+
 def next_approved_revision(rev):
     if rev == "":
         return "01"

ietf/wgrecord/views_ballot.py

@@ -22,7 +22,7 @@
 from utils import *
 from group.models import Group, GroupHistory, GroupEvent, save_group_in_history
 from name.models import GroupBallotPositionName, CharterDocStateName, GroupStateName
-from doc.models import Document, DocEvent, GroupBallotPositionDocEvent, save_document_in_history, WriteupDocEvent
+from doc.models import Document, DocEvent, GroupBallotPositionDocEvent, WriteupDocEvent
 
 def default_action_text(wg, doc, user):
    e = WriteupDocEvent(doc=doc, by=user)
@@ -100,7 +100,7 @@ def edit_position(request, name):
         else:
             raise Http404
 
-    doc = get_object_or_404(Document, name=wg.charter.name)
+    doc = set_or_create_charter(wg)
     started_process = doc.latest_event(type="started_iesg_process")
 
     ad = login = request.user.get_profile()
@@ -230,7 +230,7 @@ def send_ballot_comment(request, name):
         else:
             raise Http404
 
-    doc = wg.charter
+    doc = set_or_create_charter(wg)
     started_process = doc.latest_event(type="started_iesg_process")
     if not started_process:
         raise Http404()
@@ -319,7 +319,7 @@ def announcement_text(request, name, ann):
         else:
             raise Http404
 
-    doc = wg.charter
+    doc = set_or_create_charter(wg)
 
     login = request.user.get_profile()
 
@@ -370,7 +370,7 @@ def approve_ballot(request, name):
         else:
             raise Http404
 
-    doc = wg.charter
+    doc = set_or_create_charter(wg)
 
     login = request.user.get_profile()
 
@@ -384,7 +384,7 @@ def approve_ballot(request, name):
         new_state = GroupStateName.objects.get(slug="active")
         new_charter_state = CharterDocStateName.objects.get(slug="approved")
 
-        save_document_in_history(doc)
+        save_charter_in_history(doc)
         save_group_in_history(wg)
 
         prev_state = wg.state