Merged in fixes to the migration from olau@iola.dk. Merged in charter branch from olau@iola.dk. Added various fixes and correction of merge errors.

 - Legacy-Id: 4353

Author: levkowetz

ietf/doc/admin.py

@@ -1,3 +1,4 @@
+from django.template.defaultfilters import slugify
 from django.utils.safestring import mark_safe
 from django.contrib import admin
 from django import forms
@@ -43,7 +44,7 @@ def render(self, name, value, attrs=None, choices=()):
         html = []
         first = True
         for label, states in categorized_choices:
-            htmlid = "id_%s_%s" % (name, label)
+            htmlid = "id_%s_%s" % (name, slugify(label))
 
             html.append('<div style="clear:both;padding-top:%s">' % ("1em" if first else "0.5em"))
             html.append(u'<label for="%s">%s:</label>' % (htmlid, label))
@@ -108,11 +109,14 @@ def state(self, instance):
 admin.site.register(DocHistory, DocHistoryAdmin)
 
 class DocAliasAdmin(admin.ModelAdmin):
-    list_display = [ 'name', 'document_link', ]
-    search_fields = [ 'name', 'document__name', ]
+    list_display = ['name', 'document_link']
+    search_fields = ['name', 'document__name']
     raw_id_fields = ['document']
 admin.site.register(DocAlias, DocAliasAdmin)
 
+class BallotTypeAdmin(admin.ModelAdmin):
+    list_display = ["slug", "doc_type", "name", "question"]
+admin.site.register(BallotType, BallotTypeAdmin)
 
 # events
 
@@ -126,12 +130,13 @@ def rev(obj):
 admin.site.register(DocEvent, DocEventAdmin)
 
 admin.site.register(NewRevisionDocEvent, DocEventAdmin)
+admin.site.register(BallotDocEvent, DocEventAdmin)
 admin.site.register(WriteupDocEvent, DocEventAdmin)
 admin.site.register(LastCallDocEvent, DocEventAdmin)
 admin.site.register(TelechatDocEvent, DocEventAdmin)
 
 class BallotPositionDocEventAdmin(DocEventAdmin):
-    raw_id_fields = ["doc", "by", "ad"]
+    raw_id_fields = ["doc", "by", "ad", "ballot"]
 
 admin.site.register(BallotPositionDocEvent, BallotPositionDocEventAdmin)
 

ietf/doc/migrations/0001_initial.py

@@ -12,11 +12,11 @@
 import datetime, os
 
 class StateType(models.Model):
-    slug = models.CharField(primary_key=True, max_length=30) # draft, draft_iesg, charter, ...
-    label = models.CharField(max_length=255) # State, IESG state, WG state, ...
+    slug = models.CharField(primary_key=True, max_length=30) # draft, draft-iesg, charter, ...
+    label = models.CharField(max_length=255, help_text="Label that should be used (e.g. in admin) for state drop-down for this type of state") # State, IESG state, WG state, ...
 
     def __unicode__(self):
-        return self.label
+        return self.slug
 
 class State(models.Model):
     type = models.ForeignKey(StateType)
@@ -46,10 +46,10 @@ class DocumentInfo(models.Model):
     stream = models.ForeignKey(StreamName, blank=True, null=True) # IETF, IAB, IRTF, Independent Submission
     group = models.ForeignKey(Group, blank=True, null=True) # WG, RG, IAB, IESG, Edu, Tools
 
-    abstract = models.TextField()
+    abstract = models.TextField(blank=True)
     rev = models.CharField(verbose_name="revision", max_length=16, blank=True)
     pages = models.IntegerField(blank=True, null=True)
-    order = models.IntegerField(default=1)
+    order = models.IntegerField(default=1, blank=True)
     intended_std_level = models.ForeignKey(IntendedStdLevelName, verbose_name="Intended standardization level", blank=True, null=True)
     std_level = models.ForeignKey(StdLevelName, verbose_name="Standardization level", blank=True, null=True)
     ad = models.ForeignKey(Person, verbose_name="area director", related_name='ad_%(class)s_set', blank=True, null=True)
@@ -149,15 +149,10 @@ def __unicode__(self):
 
     def get_absolute_url(self):
         name = self.name
-        if self.type_id == "charter":
-            return urlreverse('wg_view', kwargs={ 'name': self.group.acronym }, urlconf="ietf.urls")
-        elif self.type_id == "draft":
-            if self.get_state_slug() == "rfc":
-                aliases = self.docalias_set.filter(name__startswith="rfc")
-                if aliases:
-                    name = aliases[0].name
-            return urlreverse('doc_view', kwargs={ 'name': name }, urlconf="ietf.urls")
-
+        if self.type_id == "draft" and self.get_state_slug() == "rfc":
+            aliases = self.docalias_set.filter(name__startswith="rfc")
+            if aliases:
+                name = aliases[0].name
         elif self.type_id in ('slides','agenda','minutes'):
             session = self.session_set.all()[0]
             meeting = session.meeting
@@ -172,6 +167,9 @@ def get_absolute_url(self):
                     self.type_id,
                     filename)
             return url
+        return urlreverse('doc_view', kwargs={ 'name': name }, urlconf="ietf.urls")
+
+
 
     def file_tag(self):
         return u"<%s>" % self.filename_with_rev()
@@ -194,6 +192,9 @@ def canonical_name(self):
             a = self.docalias_set.filter(name__startswith="rfc")
             if a:
                 name = a[0].name
+        elif self.type_id == "charter":
+            return "charter-ietf-%s" % self.chartered_group.acronym
+
         return name
 
 class RelatedDocHistory(models.Model):
@@ -216,11 +217,19 @@ class Meta:
 
 class DocHistory(DocumentInfo):
     doc = models.ForeignKey(Document, related_name="history_set")
-    name = models.CharField(max_length=255) # WG charter names can change if the group acronym changes
+    name = models.CharField(max_length=255) # WG charter canonical names can change if the group acronym changes
     related = models.ManyToManyField('DocAlias', through=RelatedDocHistory, blank=True)
     authors = models.ManyToManyField(Email, through=DocHistoryAuthor, blank=True)
     def __unicode__(self):
         return unicode(self.doc.name)
+
+    def canonical_name(self):
+        return self.name
+
+    def latest_event(self, *args, **kwargs):
+        kwargs["time__lte"] = self.time
+        return self.doc.latest_event(*args, **kwargs)
+
     class Meta:
         verbose_name = "document history"
         verbose_name_plural = "document histories"
@@ -234,7 +243,7 @@ def get_model_fields_as_dict(obj):
     # copy fields
     fields = get_model_fields_as_dict(doc)
     fields["doc"] = doc
-    fields["name"] = doc.name
+    fields["name"] = doc.canonical_name()
 
     dochist = DocHistory(**fields)
     dochist.save()
@@ -311,6 +320,8 @@ class DocReminder(models.Model):
     # IESG events
     ("started_iesg_process", "Started IESG process on document"),
 
+    ("created_ballot", "Created ballot"),
+    ("closed_ballot", "Closed ballot"),
     ("sent_ballot_announcement", "Sent ballot announcement"),
     ("changed_ballot_position", "Changed ballot position"),
 
@@ -347,7 +358,26 @@ class NewRevisionDocEvent(DocEvent):
     rev = models.CharField(max_length=16)
 
 # IESG events
+class BallotType(models.Model):
+    doc_type = models.ForeignKey(DocTypeName, blank=True, null=True)
+    slug = models.SlugField()
+    name = models.CharField(max_length=255)
+    question = models.TextField(blank=True)
+    used = models.BooleanField(default=True)
+    order = models.IntegerField(default=0)
+    positions = models.ManyToManyField(BallotPositionName, blank=True)
+
+    def __unicode__(self):
+        return self.name
+    
+    class Meta:
+        ordering = ['order']
+
+class BallotDocEvent(DocEvent):
+    ballot_type = models.ForeignKey(BallotType)
+
 class BallotPositionDocEvent(DocEvent):
+    ballot = models.ForeignKey(BallotDocEvent, null=True, default=None) # default=None is a temporary migration period fix, should be removed when charter branch is live
     ad = models.ForeignKey(Person)
     pos = models.ForeignKey(BallotPositionName, verbose_name="position", default="norecord")
     discuss = models.TextField(help_text="Discuss text if position is discuss", blank=True)
@@ -365,14 +395,6 @@ class TelechatDocEvent(DocEvent):
     telechat_date = models.DateField(blank=True, null=True)
     returning_item = models.BooleanField(default=False)
 
-# Charter ballot events
-class GroupBallotPositionDocEvent(DocEvent):
-    ad = models.ForeignKey(Person)
-    pos = models.ForeignKey(GroupBallotPositionName, verbose_name="position", default="norecord")
-    block_comment = models.TextField(help_text="Blocking comment if position is comment", blank=True)
-    block_comment_time = models.DateTimeField(help_text="Blocking comment was written", blank=True, null=True)
-    comment = models.TextField(help_text="Non-blocking comment", blank=True)
-    comment_time = models.DateTimeField(help_text="Time non-blocking comment was written", blank=True, null=True)
-
+# charter events
 class InitialReviewDocEvent(DocEvent):
     expires = models.DateTimeField(blank=True, null=True)

ietf/doc/migrations/0002_auto__del_groupballotpositiondocevent__add_ballottype__add_ballotdocev.py

@@ -175,32 +175,6 @@ def review_by_rfc_editor(self):
     def expired_tombstone(self):
         return False
 
-    def calc_process_start_end(self):
-        import datetime
-        start, end = datetime.datetime.min, datetime.datetime.max
-        e = self.latest_event(type="started_iesg_process")
-        if e:
-            start = e.time
-            if self.get_state_slug() == "rfc" and self.name.startswith("draft") and not hasattr(self, "viewing_as_rfc"):
-                previous_process = self.latest_event(type="started_iesg_process", time__lt=e.time)
-                if previous_process:
-                    start = previous_process.time
-                    end = e.time
-        self._process_start = start
-        self._process_end = end
-
-    @property
-    def process_start(self):
-        if not hasattr(self, "_process_start"):
-            self.calc_process_start_end()
-        return self._process_start
-
-    @property
-    def process_end(self):
-        if not hasattr(self, "_process_end"):
-            self.calc_process_start_end()
-        return self._process_end
-
     #shepherd = BrokenForeignKey('PersonOrOrgInfo', null=True, blank=True, null_values=(0, )) # same name
 
     #idinternal = FKAsOneToOne('idinternal', reverse=True, query=models.Q(rfc_flag = 0))
@@ -823,7 +797,7 @@ class Meta:
 class Position(BallotPositionDocEvent):
     def from_object(self, base):
         for f in base._meta.fields:
-            if not f.name in ('discuss', "ad"): # don't overwrite properties
+            if not f.name in ('discuss', 'ad', 'ballot', ): # don't overwrite properties
                 setattr(self, f.name, getattr(base, f.name))
 
         self.orig = base

ietf/doc/migrations/__init__.py

@@ -30,17 +30,14 @@ def get_tags_for_stream_id(stream_id):
     else:
         return []
 
-def active_ballot_positions(doc):
+def active_ballot_positions(doc, ballot=None):
     """Return dict mapping each active AD to a current ballot position (or None if they haven't voted)."""
     active_ads = list(Person.objects.filter(role__name="ad", role__group__state="active"))
     res = {}
 
-    start = datetime.datetime.min
-    e = doc.latest_event(type="started_iesg_process")
-    if e:
-        start = e.time
-
-    positions = BallotPositionDocEvent.objects.filter(doc=doc, type="changed_ballot_position", ad__in=active_ads, time__gte=start).select_related('ad').order_by("-time", "-id")
+    if not ballot:
+        ballot = doc.latest_event(BallotDocEvent, type="created_ballot")
+    positions = BallotPositionDocEvent.objects.filter(doc=doc, type="changed_ballot_position", ad__in=active_ads, ballot=ballot).select_related('ad', 'pos').order_by("-time", "-id")
 
     for pos in positions:
         if pos.ad not in res:
@@ -51,7 +48,64 @@ def active_ballot_positions(doc):
             res[ad] = None
 
     return res
+
+def needed_ballot_positions(doc, active_positions):
+    '''Returns text answering the question "what does this document
+    need to pass?".  The return value is only useful if the document
+    is currently in IESG evaluation.'''
+    yes = [p for p in active_positions if p and p.pos_id == "yes"]
+    noobj = [p for p in active_positions if p and p.pos_id == "noobj"]
+    blocking = [p for p in active_positions if p and p.pos.blocking]
+    recuse = [p for p in active_positions if p and p.pos_id == "recuse"]
+
+    answer = []
+    if yes < 1:
+        answer.append("Needs a YES.")
+    if blocking:
+        if blocking:
+            answer.append("Has a %s." % blocking[0].pos.name.upper())
+        else:
+            answer.append("Has %d %s." % (len(blocking), blocking[0].name.upper()))
+    needed = 1
+    if doc.type_id == "draft" and doc.intended_std_level_id in ("bcp", "ps", "ds", "std"):
+        # For standards-track, need positions from 2/3 of the
+        # non-recused current IESG.
+        needed = (len(active_positions) - len(recuse)) * 2 // 3
+
+    have = len(yes) + len(noobj) + len(blocking)
+    if have < needed:
+        more = needed - have
+        if more == 1:
+            answer.append("Needs %d more position." % more)
+        else:
+            answer.append("Needs %d more positions." % more)
+    else:
+        if blocking:
+            answer.append("Has enough positions to pass once %s positions are resolved." % blocking[0].pos.name.upper())
+        else:
+            answer.append("Has enough positions to pass.")
+
+    return " ".join(answer)
 
+def ballot_open(doc, ballot_type_slug):
+    e = doc.latest_event(BallotDocEvent, ballot_type__slug=ballot_type_slug)
+    return e and not e.type == "closed_ballot"
+
+def create_ballot_if_not_open(doc, by, ballot_type_slug):
+    if not ballot_open(doc, ballot_type_slug):
+        e = BallotDocEvent(type="created_ballot", by=by, doc=doc)
+        e.ballot_type = BallotType.objects.get(doc_type=doc.type, slug=ballot_type_slug)
+        e.desc = u'Created "%s" ballot' % e.ballot_type.name
+        e.save()
+
+def close_open_ballots(doc, by):
+    for t in BallotType.objects.filter(doc_type=doc.type_id):
+        if ballot_open(doc, t.slug):
+            e = BallotDocEvent(type="closed_ballot", doc=doc, by=by)
+            e.ballot_type = t
+            e.desc = 'Closed "%s" ballot' % t.name
+            e.save()
+
 def get_rfc_number(doc):
     qs = doc.docalias_set.filter(name__startswith='rfc')
     return qs[0].name[3:] if qs else None
@@ -79,6 +133,16 @@ def augment_with_start_time(docs):
 
     return docs
 
+def get_chartering_type(doc):
+    chartering = ""
+    if doc.get_state_slug() not in ("notrev", "approved"):
+        if doc.group.state_id == "proposed":
+            chartering = "initial"
+        elif doc.group.state_id == "active":
+            chartering = "rechartering"
+
+    return chartering
+
 def augment_with_telechat_date(docs):
     """Add a telechat_date attribute to each document with the
     scheduled telechat or None if it's not scheduled."""
@@ -99,6 +163,3 @@ def augment_with_telechat_date(docs):
         seen.add(e.doc_id)
 
     return docs
-
-
-

ietf/doc/models.py

@@ -1,8 +1,6 @@
 from ietf.utils.proxy import TranslatingManager, proxy_role_email
 
 from models import *
-from ietf.doc.models import Document # for charter text
-from ietf.wgcharter.utils import get_charter_for_revision, approved_revision
 
 class Acronym(Group):
     class LazyIndividualSubmitter(object):

ietf/doc/proxy.py

@@ -35,21 +35,23 @@ def get_charter_text(group):
     # get file path from settings. Syntesize file name from path, acronym, and suffix
     try:
         # Try getting charter from new charter tool
-        from ietf.wgcharter.utils import get_charter_for_revision, approved_revision
-
-        charter = group.charter
-        ch = get_charter_for_revision(charter, charter.rev)
-        name = ch.name
-        rev = approved_revision(ch.rev)
-        filename = os.path.join(charter.get_file_path(), "%s-%s.txt" % (name, rev))
-        desc_file = open(filename)
-        desc = desc_file.read()
-        return desc
-    except:
+        c = group.charter
+
+        # find the latest, preferably approved, revision
+        for h in group.charter.history_set.exclude(rev="").order_by("time"):
+            h_appr = "-" not in h.rev
+            c_appr = "-" not in c.rev
+            if (h.rev > c.rev and not (c_appr and not h_appr)) or (h_appr and not c_appr):
+                c = h
+
+        filename = os.path.join(c.get_file_path(), "%s-%s.txt" % (c.canonical_name(), c.rev))
+        with open(filename) as f:
+            return f.read()
+    except IOError:
         try:
             filename = os.path.join(settings.IETFWG_DESCRIPTIONS_PATH, group.acronym) + ".desc.txt"
             desc_file = open(filename)
             desc = desc_file.read()
-        except:
+        except BaseException:    
             desc = 'Error Loading Work Group Description'
         return desc