Import more history and fix import/proxy bugs (enough to get draft-arkko-townsley-coexistence working), more proxying for group/person related things (enough to get left base menu working)

 - Legacy-Id: 2714

Author: OleLaursen

ietf/idrfc/idrfc_wrapper.py

@@ -622,7 +622,7 @@ def _init(self):
                 p = dict(ad_name=pos.ad.get_name(),
                          ad_username="", # FIXME: don't seem to have username at the moment
                          position=pos.pos.name,
-                         is_old_ad=pos.ad in active_ads,
+                         is_old_ad=pos.ad not in active_ads,
                          old_positions=[])
 
                 if pos.pos.slug == "discuss":

ietf/idrfc/views_doc.py

@@ -148,14 +148,30 @@ def document_main(request, name):
 def _get_history(doc, versions):
     results = []
     if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+        versions = [] # clear versions
         for e in doc._draft.event_set.all().select_related('by').order_by('-time'):
             info = {}
+            if e.type == "new_revision":
+                filename = u"%s-%s" % (e.doc.name, e.newrevision.rev)
+                e.desc = 'New version available: <a href="http://tools.ietf.org/id/%s.txt">%s</a>' % (filename, filename)
+                if int(e.newrevision.rev) != 0:
+                    e.desc += ' (<a href="http://tools.ietf.org/rfcdiff?url2=%s">diff from -%02d</a>)' % (filename, int(e.newrevision.rev) - 1)
+                info["dontmolest"] = True
+                    
             info['text'] = e.desc
             info['by'] = e.by.get_name()
             info['textSnippet'] = truncatewords_html(format_textarea(fill(info['text'], 80)), 25)
-            info['snipped'] = info['textSnippet'][-3:] == "..."
-            e.version = e.doc.rev
+            info['snipped'] = info['textSnippet'][-3:] == "..." and e.type != "new_revision"
             results.append({'comment':e, 'info':info, 'date':e.time, 'is_com':True})
+
+        prev_rev = "00"
+        for o in reversed(results):
+            e = o["comment"]
+            if e.type == "new_revision":
+                e.version = e.newrevision.rev
+            else:
+                e.version = prev_rev
+            prev_rev = e.version
     else:
         if doc.is_id_wrapper:
             comments = DocumentComment.objects.filter(document=doc.tracker_id).exclude(rfc_flag=1)

ietf/idrfc/views_edit.py

@@ -236,7 +236,7 @@ def diff(obj, attr, name):
                     setattr(obj, attr, r[attr])
 
             diff(doc, 'intended_status', "Intended Status")
-            diff(doc.idinternal, 'status_date', "Status Date")
+            diff(doc.idinternal, 'status_date', "Status date")
             if 'area_acronym' in r and r['area_acronym']:
                 diff(doc.idinternal, 'area_acronym', 'Area acronym')
             diff(doc.idinternal, 'job_owner', 'Responsible AD')

ietf/templates/idrfc/doc_history.html

@@ -65,8 +65,12 @@
 {{ c.info.text|fill:"80"|safe|urlize|linebreaksbr|keep_spacing|sanitize_html|safe }}
 </div>
 {% else %}
+{% if c.info.dontmolest %}
+{{ c.info.text|safe }}
+{% else %}
 {{ c.info.text|fill:"80"|safe|urlize|linebreaksbr|keep_spacing|sanitize_html|safe }}
 {% endif %}
+{% endif %}
 </td>
 {% endif %}
 

redesign/doc/admin.py

@@ -40,6 +40,7 @@ class EventAdmin(admin.ModelAdmin):
 admin.site.register(Message, EventAdmin)
 admin.site.register(Text, EventAdmin)
 admin.site.register(BallotPosition, EventAdmin)
+admin.site.register(Status, EventAdmin)
 admin.site.register(Expiration, EventAdmin)
 admin.site.register(Telechat, EventAdmin)
 

redesign/doc/models.py

@@ -6,6 +6,7 @@
 from redesign.person.models import Email
 from redesign.util import admin_link
 
+import datetime
 
 class RelatedDoc(models.Model):
     relationship = models.ForeignKey(DocRelationshipName)
@@ -49,12 +50,13 @@ class Meta:
         abstract = True
     def author_list(self):
         return ", ".join(email.address for email in self.authors.all())
-    def latest_event(self, **filter_args):
-        e = self.event_set.filter(**filter_args).order_by('-time')[:1]
-        if e:
-            return e[0]
-        else:
-            return None
+    def latest_event(self, *args, **filter_args):
+        """Get latest event with specific requirements, e.g.
+        d.latest_event(type="xyz") returns an Event while
+        d.latest_event(Status, type="xyz") returns a Status event."""
+        model = args[0] if args else Event
+        e = model.objects.filter(doc=self).filter(**filter_args).order_by('-time')[:1]
+        return e[0] if e else None
 
 class Document(DocumentInfo):
     name = models.CharField(max_length=255, primary_key=True)           # immutable
@@ -150,6 +152,7 @@ class SendQueue(models.Model):
     ("changed_document", "Changed document metadata"),
 
     # misc document events
+    ("added_comment", "Added comment"),
     ("added_tombstone", "Added tombstone"),
     ("requested_resurrect", "Requested resurrect"),
 
@@ -163,6 +166,9 @@ class SendQueue(models.Model):
 
     ("changed_last_call_text", "Changed last call text"),
     ("sent_last_call", "Sent last call"),
+    ("requested_last_call", "Requested last call"),
+    
+    ("changed_status_date", "Changed status date"),
 
     ("scheduled_for_telechat", "Scheduled for telechat"),
 
@@ -174,9 +180,9 @@ class SendQueue(models.Model):
 
 class Event(models.Model):
     """An occurrence in connection with a document."""
-    time = models.DateTimeField()
+    time = models.DateTimeField(default=datetime.datetime.now, help_text="When the event happened")
     type = models.CharField(max_length=50, choices=EVENT_TYPES)
-    by = models.ForeignKey(Email, blank=True, null=True)
+    by = models.ForeignKey(Email, blank=True, null=True) # FIXME: make NOT NULL?
     doc = models.ForeignKey('doc.Document')
     desc = models.TextField()
 
@@ -192,7 +198,10 @@ class Message(Event):
 
 class Text(Event):
     content = models.TextField(blank=True)
-    
+
+class NewRevision(Event):
+    rev = models.CharField(max_length=16)
+   
 # IESG events
 class BallotPosition(Event):
     ad = models.ForeignKey(Email)
@@ -202,6 +211,9 @@ class BallotPosition(Event):
     comment = models.TextField(help_text="Optional comment", blank=True)
     comment_time = models.DateTimeField(help_text="Time optional comment was written", blank=True, null=True)
 
+class Status(Event):
+    date = models.DateField()
+
 class Expiration(Event):
     expires = models.DateTimeField()
 

redesign/doc/proxy.py

@@ -2,6 +2,10 @@
 from redesign.person.models import Email 
 from redesign.proxy_utils import TranslatingManager
 
+from django.conf import settings
+
+import glob, os
+
 
 class InternetDraft(Document):
     objects = TranslatingManager(dict(filename="name",
@@ -12,53 +16,61 @@ class InternetDraft(Document):
 
     # things from InternetDraft
 
-#     id_document_tag = models.AutoField(primary_key=True)
+    #id_document_tag = models.AutoField(primary_key=True)
     @property
     def id_document_tag(self):
         return self.name              # Will only work for some use cases
-#     title = models.CharField(max_length=255, db_column='id_document_name') # same name
-#     id_document_key = models.CharField(max_length=255, editable=False)
+    #title = models.CharField(max_length=255, db_column='id_document_name') # same name
+    #id_document_key = models.CharField(max_length=255, editable=False)
     @property
     def id_document_key(self):
         return self.title.upper()
-#     group = models.ForeignKey(Acronym, db_column='group_acronym_id')
+    #group = models.ForeignKey(Acronym, db_column='group_acronym_id')
     @property
     def group(self):
-        return super(self.__class__, self).group
-#     filename = models.CharField(max_length=255, unique=True)
+        from group.proxy import Acronym as AcronymProxy
+        return AcronymProxy(super(self.__class__, self).group)
+    #filename = models.CharField(max_length=255, unique=True)
     @property
     def filename(self):
         return self.name
-#     revision = models.CharField(max_length=2)
+    #revision = models.CharField(max_length=2)
     @property
     def revision(self):
         return self.rev
-#     revision_date = models.DateField()
+    #revision_date = models.DateField()
     @property
     def revision_date(self):
         e = self.latest_event(type="new_revision")
-        return e.time if e else None
-#     file_type = models.CharField(max_length=20)
+        return e.time.date() if e else None
+    #file_type = models.CharField(max_length=20)
     @property
     def file_type(self):
-        return ".txt"                   # FIXME XXX should look in the repository to see what's available
-#     txt_page_count = models.IntegerField()
+        matches = glob.glob(os.path.join(settings.INTERNET_DRAFT_PATH, self.filename + "*.*"))
+        possible_types = [".txt", ".pdf", ".xml", ".ps"]
+        res = set()
+        for m in matches:
+            for t in possible_types:
+                if m.endswith(t):
+                    res.add(t)
+        return ",".join(res)
+    #txt_page_count = models.IntegerField()
     @property
     def txt_page_count(self):
         return self.pages
-#     local_path = models.CharField(max_length=255, blank=True) # unused
-#     start_date = models.DateField()
+    #local_path = models.CharField(max_length=255, blank=True) # unused
+    #start_date = models.DateField()
     @property
     def start_date(self):
         return self.dochistory_set.dates("time","day","ASC")[0]
-#     expiration_date = models.DateField()
+    #expiration_date = models.DateField()
     @property
     def expiration_date(self):
         return self.expiration()
-#     abstract = models.TextField() # same name
-#     dunn_sent_date = models.DateField(null=True, blank=True) # unused
-#     extension_date = models.DateField(null=True, blank=True) # unused
-#     status = models.ForeignKey(IDStatus)
+    #abstract = models.TextField() # same name
+    #dunn_sent_date = models.DateField(null=True, blank=True) # unused
+    #extension_date = models.DateField(null=True, blank=True) # unused
+    #status = models.ForeignKey(IDStatus)
     @property
     def status(self):
         from redesign.name.proxy import IDStatus
@@ -69,63 +81,63 @@ def status_id(self):
         from redesign.name.proxy import IDStatus
         return { 'active': 1, 'repl': 5, 'expired': 2, 'rfc': 3, 'auth-rm': 4, 'ietf-rm': 6 }[self.state_id]
 
-#     intended_status = models.ForeignKey(IDIntendedStatus)
+    #intended_status = models.ForeignKey(IDIntendedStatus)
     @property
     def intended_status(self):
         return self.intended_std_level
 
-#     lc_sent_date = models.DateField(null=True, blank=True)
+    #lc_sent_date = models.DateField(null=True, blank=True)
     @property
     def lc_sent_date(self):
         e = self.latest_event(type="sent_last_call")
         return e.time if e else None
 
-#     lc_changes = models.CharField(max_length=3) # used in DB, unused in Django code?
+    #lc_changes = models.CharField(max_length=3) # used in DB, unused in Django code?
 
-#     lc_expiration_date = models.DateField(null=True, blank=True)
+    #lc_expiration_date = models.DateField(null=True, blank=True)
     @property
     def lc_expiration_date(self):
         e = self.latest_event(type="sent_last_call")
         return e.expiration.expires if e else None
 
-#     b_sent_date = models.DateField(null=True, blank=True)
+    #b_sent_date = models.DateField(null=True, blank=True)
     @property
     def b_sent_date(self):
         e = self.latest_event(type="sent_ballot_announcement")
         return e.time if e else None
 
-#     b_discussion_date = models.DateField(null=True, blank=True) # unused
+    #b_discussion_date = models.DateField(null=True, blank=True) # unused
 
-#     b_approve_date = models.DateField(null=True, blank=True)
+    #b_approve_date = models.DateField(null=True, blank=True)
     @property
     def b_approve_date(self):
         e = self.latest_event(type="approved_ballot")
         return e.time if e else None
 
-#     wgreturn_date = models.DateField(null=True, blank=True) # unused
+    #wgreturn_date = models.DateField(null=True, blank=True) # unused
 
-#     rfc_number = models.IntegerField(null=True, blank=True, db_index=True)
+    #rfc_number = models.IntegerField(null=True, blank=True, db_index=True)
     @property
     def rfc_number(self):
         try:
             self.docalias_set.filter(name__startswith="rfc")[0].name[3:]
         except IndexError:
             return None
 
-#     comments = models.TextField(blank=True) # unused
+    #comments = models.TextField(blank=True) # unused
 
-#     last_modified_date = models.DateField()
+    #last_modified_date = models.DateField()
     @property
     def last_modified_date(self):
         return self.time
 
-#     replaced_by = models.ForeignKey('self', db_column='replaced_by', blank=True, null=True, related_name='replaces_set')
+    #replaced_by = models.ForeignKey('self', db_column='replaced_by', blank=True, null=True, related_name='replaces_set')
     @property
     def replaced_by(self):
         r = InternetDraft.objects.filter(docalias__relateddoc__relationship="replaces", docalias__relateddoc__related_document_set=self)
         return r[0] if r else None
 
-#     replaces = FKAsOneToOne('replaces', reverse=True)
+    #replaces = FKAsOneToOne('replaces', reverse=True)
     @property
     def replaces(self):
         r = InternetDraft.objects.filter(related__doc_alias__document=self, related__relationship="replaces")
@@ -137,17 +149,17 @@ def replaces_set(self):
         # this is replaced_by
         return InternetDraft.objects.filter(docalias__relateddoc__relationship="replaces", docalias__relateddoc__related_document_set=self)
 
-#     review_by_rfc_editor = models.BooleanField()
+    #review_by_rfc_editor = models.BooleanField()
     @property
     def review_by_rfc_editor(self): raise NotImplemented # should use tag
 
-#     expired_tombstone = models.BooleanField()
+    #expired_tombstone = models.BooleanField()
     @property
     def expired_tombstone(self):
         # FIXME: this is probably not perfect, what happens when we delete it again
         return self.latest_event(type="added_tombstone")
 
-#     idinternal = FKAsOneToOne('idinternal', reverse=True, query=models.Q(rfc_flag = 0))
+    #idinternal = FKAsOneToOne('idinternal', reverse=True, query=models.Q(rfc_flag = 0))
     @property
     def idinternal(self):
         return self if self.iesg_state else None
@@ -246,7 +258,9 @@ def token_email(self):
 
     #status_date = models.DateField(blank=True,null=True)
     @property
-    def status_date(self): raise NotImplemented # FIXME
+    def status_date(self):
+        e = self.latest_event(Status, type="changed_status_date")
+        return e.date if e else None
 
     #email_display = models.CharField(blank=True, max_length=50) # unused
     #agenda = models.IntegerField(null=True, blank=True)
@@ -276,7 +290,8 @@ def mark_by(self):
     # job_owner = models.ForeignKey(IESGLogin, db_column='job_owner', related_name='documents')
     @property
     def job_owner(self):
-        return self.ad
+        from person.proxy import IESGLogin as IESGLoginProxy
+        return IESGLoginProxy(self.ad)
 
     #event_date = models.DateField(null=True)
     @property
@@ -485,7 +500,7 @@ def needed(self, standardsTrack=True):
 
 	yes = noobj = discuss = recuse = 0
 	for position in positions:
-            p = position.pos_id
+            p = position.ballotposition.pos_id
             if p == "yes":
                 yes += 1
             if p == "noobj":
@@ -505,7 +520,7 @@ def needed(self, standardsTrack=True):
 	if standardsTrack:
 	    # For standards-track, need positions from 2/3 of the
 	    # non-recused current IESG.
-	    needed = (len(ads) - recuse) * 2 / 3
+	    needed = int((len(ads) - recuse) * 2 / 3)
 	else:
 	    # Info and experimental only need one position.
 	    needed = 1