merged in my v4.33 branch

- Legacy-Id: 4767

ietf/doc/migrations/0004_clean_stale_discusses.py

@@ -0,0 +1,372 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+from person.models import Person
+from doc.models import BallotPositionDocEvent
+import sys
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        system_user = Person.objects.get(name="(System)")
+        change_count=0
+        progress=0
+        print "starting"
+        docset = set([e.doc for e in BallotPositionDocEvent.objects.exclude(pos__blocking=True).exclude(discuss="")])
+        print "updating non-blocking positions with non-empty discusses on",len(docset),"documents"
+        for doc in docset:
+            ballot_positions = BallotPositionDocEvent.objects.filter(doc=doc,type="changed_ballot_position")
+            for ad in set([e.ad for e in ballot_positions]):
+                e = ballot_positions.filter(ad=ad).order_by("-time")[0]
+                if e.discuss and not e.pos.blocking:
+                    # time and discuss are intentionally not part of what update gets initialized with
+                    update = BallotPositionDocEvent(doc=e.doc,type=e.type,by=e.by,ballot=e.ballot,ad=e.ad,pos=e.pos,discuss_time=e.discuss_time,comment=e.comment,comment_time=e.comment_time)
+                    update.by=system_user
+                    update.desc="post-migration administrative database adjustment to the "+e.pos.name+" position for "+e.ad.plain_name()
+                    update.save()
+                    change_count += 1
+            progress +=1
+            if not (progress % 100):
+                print str(progress)+",",
+                sys.stdout.flush()
+        print
+        print "Updated",change_count,"positions"
+
+
+    def backwards(self, orm):
+	pass
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'doc.ballotdocevent': {
+            'Meta': {'ordering': "['-time', '-id']", 'object_name': 'BallotDocEvent', '_ormbases': ['doc.DocEvent']},
+            'ballot_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.BallotType']"}),
+            'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'doc.ballotpositiondocevent': {
+            'Meta': {'ordering': "['-time', '-id']", 'object_name': 'BallotPositionDocEvent', '_ormbases': ['doc.DocEvent']},
+            'ad': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']"}),
+            'ballot': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['doc.BallotDocEvent']", 'null': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'comment_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'discuss': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'discuss_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'pos': ('django.db.models.fields.related.ForeignKey', [], {'default': "'norecord'", 'to': "orm['name.BallotPositionName']"})
+        },
+        'doc.ballottype': {
+            'Meta': {'ordering': "['order']", 'object_name': 'BallotType'},
+            'doc_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.DocTypeName']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'positions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['name.BallotPositionName']", 'symmetrical': 'False', 'blank': 'True'}),
+            'question': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'db_index': 'True'}),
+            'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+        },
+        'doc.docalias': {
+            'Meta': {'object_name': 'DocAlias'},
+            'document': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.Document']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'})
+        },
+        'doc.docevent': {
+            'Meta': {'ordering': "['-time', '-id']", 'object_name': 'DocEvent'},
+            'by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']"}),
+            'desc': ('django.db.models.fields.TextField', [], {}),
+            'doc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.Document']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'doc.dochistory': {
+            'Meta': {'object_name': 'DocHistory'},
+            'abstract': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ad': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'ad_dochistory_set'", 'null': 'True', 'to': "orm['person.Person']"}),
+            'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['person.Email']", 'symmetrical': 'False', 'through': "orm['doc.DocHistoryAuthor']", 'blank': 'True'}),
+            'doc': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'history_set'", 'to': "orm['doc.Document']"}),
+            'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'external_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'intended_std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.IntendedStdLevelName']", 'null': 'True', 'blank': 'True'}),
+            'internal_comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'note': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'notify': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}),
+            'pages': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'related': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.DocAlias']", 'symmetrical': 'False', 'through': "orm['doc.RelatedDocHistory']", 'blank': 'True'}),
+            'rev': ('django.db.models.fields.CharField', [], {'max_length': '16', 'blank': 'True'}),
+            'shepherd': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'shepherd_dochistory_set'", 'null': 'True', 'to': "orm['person.Person']"}),
+            'states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}),
+            'std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.StdLevelName']", 'null': 'True', 'blank': 'True'}),
+            'stream': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.StreamName']", 'null': 'True', 'blank': 'True'}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['name.DocTagName']", 'null': 'True', 'blank': 'True'}),
+            'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.DocTypeName']", 'null': 'True', 'blank': 'True'})
+        },
+        'doc.dochistoryauthor': {
+            'Meta': {'ordering': "['document', 'order']", 'object_name': 'DocHistoryAuthor'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Email']"}),
+            'document': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.DocHistory']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'order': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'doc.docreminder': {
+            'Meta': {'object_name': 'DocReminder'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'due': ('django.db.models.fields.DateTimeField', [], {}),
+            'event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.DocEvent']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.DocReminderTypeName']"})
+        },
+        'doc.document': {
+            'Meta': {'object_name': 'Document'},
+            'abstract': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ad': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'ad_document_set'", 'null': 'True', 'to': "orm['person.Person']"}),
+            'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['person.Email']", 'symmetrical': 'False', 'through': "orm['doc.DocumentAuthor']", 'blank': 'True'}),
+            'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'external_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']", 'null': 'True', 'blank': 'True'}),
+            'intended_std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.IntendedStdLevelName']", 'null': 'True', 'blank': 'True'}),
+            'internal_comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'primary_key': 'True'}),
+            'note': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'notify': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}),
+            'pages': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'related': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'reversely_related_document_set'", 'blank': 'True', 'through': "orm['doc.RelatedDocument']", 'to': "orm['doc.DocAlias']"}),
+            'rev': ('django.db.models.fields.CharField', [], {'max_length': '16', 'blank': 'True'}),
+            'shepherd': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'shepherd_document_set'", 'null': 'True', 'to': "orm['person.Person']"}),
+            'states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}),
+            'std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.StdLevelName']", 'null': 'True', 'blank': 'True'}),
+            'stream': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.StreamName']", 'null': 'True', 'blank': 'True'}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['name.DocTagName']", 'null': 'True', 'blank': 'True'}),
+            'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.DocTypeName']", 'null': 'True', 'blank': 'True'})
+        },
+        'doc.documentauthor': {
+            'Meta': {'ordering': "['document', 'order']", 'object_name': 'DocumentAuthor'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Email']"}),
+            'document': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.Document']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '1'})
+        },
+        'doc.initialreviewdocevent': {
+            'Meta': {'ordering': "['-time', '-id']", 'object_name': 'InitialReviewDocEvent', '_ormbases': ['doc.DocEvent']},
+            'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'doc.lastcalldocevent': {
+            'Meta': {'ordering': "['-time', '-id']", 'object_name': 'LastCallDocEvent', '_ormbases': ['doc.DocEvent']},
+            'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'doc.newrevisiondocevent': {
+            'Meta': {'ordering': "['-time', '-id']", 'object_name': 'NewRevisionDocEvent', '_ormbases': ['doc.DocEvent']},
+            'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'rev': ('django.db.models.fields.CharField', [], {'max_length': '16'})
+        },
+        'doc.relateddochistory': {
+            'Meta': {'object_name': 'RelatedDocHistory'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'relationship': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.DocRelationshipName']"}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.DocHistory']"}),
+            'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reversely_related_document_history_set'", 'to': "orm['doc.DocAlias']"})
+        },
+        'doc.relateddocument': {
+            'Meta': {'object_name': 'RelatedDocument'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'relationship': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.DocRelationshipName']"}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.Document']"}),
+            'target': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.DocAlias']"})
+        },
+        'doc.state': {
+            'Meta': {'ordering': "['type', 'order']", 'object_name': 'State'},
+            'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'next_states': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'previous_states'", 'symmetrical': 'False', 'to': "orm['doc.State']"}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'db_index': 'True'}),
+            'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.StateType']"}),
+            'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+        },
+        'doc.statetype': {
+            'Meta': {'object_name': 'StateType'},
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'})
+        },
+        'doc.telechatdocevent': {
+            'Meta': {'ordering': "['-time', '-id']", 'object_name': 'TelechatDocEvent', '_ormbases': ['doc.DocEvent']},
+            'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'returning_item': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'telechat_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'doc.writeupdocevent': {
+            'Meta': {'ordering': "['-time', '-id']", 'object_name': 'WriteupDocEvent', '_ormbases': ['doc.DocEvent']},
+            'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'text': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        'group.group': {
+            'Meta': {'object_name': 'Group'},
+            'acronym': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
+            'ad': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True', 'blank': 'True'}),
+            'charter': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'chartered_group'", 'unique': 'True', 'null': 'True', 'to': "orm['doc.Document']"}),
+            'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'list_archive': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'list_email': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
+            'list_subscribe': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']", 'null': 'True', 'blank': 'True'}),
+            'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.GroupStateName']", 'null': 'True'}),
+            'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.GroupTypeName']", 'null': 'True'}),
+            'unused_states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}),
+            'unused_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['name.DocTagName']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'name.ballotpositionname': {
+            'Meta': {'ordering': "['order']", 'object_name': 'BallotPositionName'},
+            'blocking': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}),
+            'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+        },
+        'name.docrelationshipname': {
+            'Meta': {'ordering': "['order']", 'object_name': 'DocRelationshipName'},
+            'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}),
+            'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+        },
+        'name.docremindertypename': {
+            'Meta': {'ordering': "['order']", 'object_name': 'DocReminderTypeName'},
+            'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}),
+            'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+        },
+        'name.doctagname': {
+            'Meta': {'ordering': "['order']", 'object_name': 'DocTagName'},
+            'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}),
+            'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+        },
+        'name.doctypename': {
+            'Meta': {'ordering': "['order']", 'object_name': 'DocTypeName'},
+            'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}),
+            'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+        },
+        'name.groupstatename': {
+            'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'},
+            'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}),
+            'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+        },
+        'name.grouptypename': {
+            'Meta': {'ordering': "['order']", 'object_name': 'GroupTypeName'},
+            'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}),
+            'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+        },
+        'name.intendedstdlevelname': {
+            'Meta': {'ordering': "['order']", 'object_name': 'IntendedStdLevelName'},
+            'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}),
+            'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+        },
+        'name.stdlevelname': {
+            'Meta': {'ordering': "['order']", 'object_name': 'StdLevelName'},
+            'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}),
+            'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+        },
+        'name.streamname': {
+            'Meta': {'ordering': "['order']", 'object_name': 'StreamName'},
+            'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}),
+            'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+        },
+        'person.email': {
+            'Meta': {'object_name': 'Email'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'address': ('django.db.models.fields.CharField', [], {'max_length': '64', 'primary_key': 'True'}),
+            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True'}),
+            'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'})
+        },
+        'person.person': {
+            'Meta': {'object_name': 'Person'},
+            'address': ('django.db.models.fields.TextField', [], {'max_length': '255', 'blank': 'True'}),
+            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'ascii': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'ascii_short': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['doc']

ietf/doc/models.py

@@ -259,11 +259,17 @@ class Document(DocumentInfo):
             return self.latest_event(type="changed_document", desc__startswith="State changed to <b>IESG Evaluation - Defer</b>")
         return None
 
+# This, and several other ballot related functions here, assume that there is only one active ballot for a document at any point in time.
+# If that assumption is violated, they will only expose the most recently created ballot
+    def ballot_open(self, ballot_type_slug):
+        e = self.latest_event(BallotDocEvent, ballot_type__slug=ballot_type_slug)
+        return e and not e.type == "closed_ballot"
+
     def active_ballot(self):
+        """Returns the most recently created ballot if it isn't closed."""
         ballot = self.latest_event(BallotDocEvent, type="created_ballot")
-        e = self.latest_event(BallotDocEvent, ballot_type__slug=ballot.ballot_type.slug) if ballot else None
-        open = e and not e.type == "closed_ballot"
-        return ballot.ballot_type if open else None
+        open = self.ballot_open(ballot.ballot_type.slug) if ballot else False
+        return ballot if open else None
 
     def active_ballot_positions(self):
         """Return dict mapping each active AD to a current ballot position (or None if they haven't voted)."""
@@ -281,7 +287,7 @@ class Document(DocumentInfo):
             if ad not in res:
                 res[ad] = None
     
-        return res.values()
+        return res
 
     def displayname_with_link(self):
         return '<a href="%s">%s-%s</a>' % (self.get_absolute_url(), self.name , self.rev)

ietf/doc/proxy.py

@@ -550,10 +550,9 @@ class InternetDraft(Document):
     def active_positions(self):
         """Returns a list of dicts, with AD and Position tuples"""
         from ietf.person.proxy import IESGLogin as IESGLoginProxy
-        from ietf.doc.utils import active_ballot_positions
 
         res = []
-        for ad, pos in active_ballot_positions(self).iteritems():
+        for ad, pos in self.active_ballot_positions().iteritems():
             res.append(dict(ad=IESGLoginProxy().from_object(ad), pos=Position().from_object(pos) if pos else None))
 
         res.sort(key=lambda x: x["ad"].last_name)

ietf/doc/tests_conflict_review.py

@@ -13,7 +13,7 @@ from django.core.urlresolvers import reverse as urlreverse
 from ietf.utils.test_utils import login_testing_unauthorized
 from ietf.utils.test_data  import make_test_data
 from ietf.utils.mail import outbox
-from ietf.doc.utils import active_ballot, create_ballot_if_not_open, ballot_open
+from ietf.doc.utils import create_ballot_if_not_open
 from ietf.doc.views_conflict_review import default_approval_text
 
 from ietf.doc.models import Document,DocEvent,NewRevisionDocEvent,BallotPositionDocEvent,TelechatDocEvent,DocAlias,State
@@ -105,7 +105,7 @@ class ConflictReviewTestCase(django.test.TestCase):
         review_doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
         self.assertEquals(review_doc.get_state('conflrev').slug,'adrev')
         self.assertTrue(review_doc.latest_event(DocEvent,type="added_comment").desc.startswith('RDNK84ZD'))
-        self.assertFalse(active_ballot(review_doc))
+        self.assertFalse(review_doc.active_ballot())
 
         # successful change to IESG Evaluation 
         iesgeval_pk = str(State.objects.get(slug='iesgeval',type__slug='conflrev').pk)
@@ -114,7 +114,7 @@ class ConflictReviewTestCase(django.test.TestCase):
         review_doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
         self.assertEquals(review_doc.get_state('conflrev').slug,'iesgeval')
         self.assertTrue(review_doc.latest_event(DocEvent,type="added_comment").desc.startswith('TGmZtEjt'))
-        self.assertTrue(active_ballot(review_doc))
+        self.assertTrue(review_doc.active_ballot())
         self.assertEquals(review_doc.latest_event(BallotPositionDocEvent, type="changed_ballot_position").pos_id,'yes')
 
 
@@ -234,7 +234,7 @@ class ConflictReviewTestCase(django.test.TestCase):
 
         doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
         self.assertEquals(doc.get_state_slug(),approve_type+'-sent')
-        self.assertFalse(ballot_open(doc, "conflrev"))
+        self.assertFalse(doc.ballot_open("conflrev"))
         
         self.assertEquals(len(outbox), messages_before + 1)
         self.assertTrue('Results of IETF-conflict review' in outbox[-1]['Subject'])

ietf/doc/utils.py

@@ -36,34 +36,6 @@ def get_tags_for_stream_id(stream_id):
     else:
         return []
 
-# This, and several other utilities here, assume that there is only one active ballot for a document at any point in time.
-# If that assumption is violated, they will only expose the most recently created ballot
-def active_ballot(doc):
-    """Returns the most recently created ballot if it isn't closed."""
-    ballot = doc.latest_event(BallotDocEvent, type="created_ballot")
-    open = ballot_open(doc,ballot.ballot_type.slug) if ballot else False
-    return ballot if open else None
-     
-
-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 = {}
-
-    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:
-            res[pos.ad] = pos
-
-    for ad in active_ads:
-        if ad not in res:
-            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
@@ -102,12 +74,8 @@ def needed_ballot_positions(doc, active_positions):
 
     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):
+    if not doc.ballot_open(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
@@ -115,7 +83,7 @@ def create_ballot_if_not_open(doc, by, ballot_type_slug):
 
 def close_open_ballots(doc, by):
     for t in BallotType.objects.filter(doc_type=doc.type_id):
-        if ballot_open(doc, t.slug):
+        if doc.ballot_open(t.slug):
             e = BallotDocEvent(type="closed_ballot", doc=doc, by=by)
             e.ballot_type = t
             e.desc = 'Closed "%s" ballot' % t.name

ietf/idrfc/templatetags/ballot_icon.py

@@ -37,7 +37,6 @@ from ietf.idtracker.models import IDInternal, BallotInfo
 from ietf.idrfc.idrfc_wrapper import position_to_string, BALLOT_ACTIVE_STATES
 from ietf.idtracker.templatetags.ietf_filters import in_group, timesince_days
 from ietf.ietfauth.decorators import has_role
-from ietf.doc.utils import active_ballot_positions
 from ietf.doc.models import BallotDocEvent
 
 register = template.Library()
@@ -83,7 +82,7 @@ def render_ballot_icon(user, doc):
         else:
             return (1, pos.pos.order)
 
-    positions = list(active_ballot_positions(doc, ballot).items())
+    positions = list(doc.active_ballot_positions().items())
     positions.sort(key=sort_key)
 
     cm = ""

ietf/idrfc/templatetags/ballot_icon_redesign.py

@@ -38,7 +38,6 @@ from ietf.idtracker.models import IDInternal, BallotInfo
 from ietf.idrfc.idrfc_wrapper import position_to_string, BALLOT_ACTIVE_STATES
 from ietf.idtracker.templatetags.ietf_filters import in_group, timesince_days
 from ietf.ietfauth.decorators import has_role
-from ietf.doc.utils import active_ballot_positions, active_ballot
 from ietf.doc.models import BallotDocEvent, BallotPositionDocEvent
 
 from datetime import date
@@ -90,7 +89,7 @@ def render_ballot_icon(user, doc):
         else:
             return (1, pos.pos.order)
 
-    positions = list(active_ballot_positions(doc, ballot).items())
+    positions = list(doc.active_ballot_positions().items())
     positions.sort(key=sort_key)
 
     cm = ""
@@ -144,7 +143,7 @@ def my_position(doc, user):
         return None
     if not in_group(user, "Area_Director"):
         return None
-    ballot = active_ballot(doc)
+    ballot = doc.active_ballot()
     pos = "No Record"
     if ballot:
       changed_pos = doc.latest_event(BallotPositionDocEvent, type="changed_ballot_position", ad__name=user_name, ballot=ballot)

ietf/idrfc/views_doc.py

@@ -143,7 +143,7 @@ def document_main(request, name, rev=None):
 
         ballot_summary = None
         if doc.get_state_slug() in ("intrev", "iesgrev"):
-            ballot_summary = needed_ballot_positions(doc, active_ballot_positions(doc).values())
+            ballot_summary = needed_ballot_positions(doc, doc.active_ballot_positions().values())
 
         return render_to_response("idrfc/document_charter.html",
                                   dict(doc=doc,
@@ -171,7 +171,7 @@ def document_main(request, name, rev=None):
 
         ballot_summary = None
         if doc.get_state_slug() in ("iesgeval"):
-            ballot_summary = needed_ballot_positions(doc, active_ballot_positions(doc).values())
+            ballot_summary = needed_ballot_positions(doc, doc.active_ballot_positions().values())
 
         return render_to_response("idrfc/document_conflict_review.html",
                                   dict(doc=doc,

ietf/submit/utils.py

@@ -17,7 +17,6 @@ from ietf.ietfauth.decorators import has_role
 
 from ietf.doc.models import *
 from ietf.person.models import Person, Alias, Email
-from ietf.doc.utils import active_ballot_positions
 from ietf.message.models import Message
 
 # Some useful states
@@ -262,7 +261,7 @@ def announce_new_versionREDESIGN(request, submission, draft, state_change_msg):
     if draft.ad:
         to_email.append(draft.ad.role_email("ad").address)
 
-    for ad, pos in active_ballot_positions(draft).iteritems():
+    for ad, pos in draft.active_ballot_positions().iteritems():
         if pos and pos.pos_id == "discuss":
             to_email.append(ad.role_email("ad").address)
 

ietf/templates/idrfc/document_ballot_content.html

@@ -57,7 +57,7 @@
 {% for p in text_positions %}
 <h2 id="{{ p.ad.plain_name|slugify }}" class="ad-ballot-comment">{% if p.old_ad %}[{% endif %}{{ p.ad.plain_name }}{% if p.old_ad %}]{% endif %}</h2>
 
-{% if p.discuss %}
+{% if p.pos.blocking and p.discuss %}
 <p><b>{{ p.pos.name }} ({{ p.discuss_time|date:"Y-m-d" }})</b> <img src="/images/comment.png" width="14" height="12" alt=""/></p>
 <pre>{{ p.discuss|wrap_text:80|escape }}</pre>
 {% endif %}

ietf/templates/iesg/scribe_doc.html

@@ -65,7 +65,7 @@ Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
         {% if doc.obj.active_ballot %}
             <br/><b>Discusses/comments</b> <a href="http://datatracker.ietf.org/idtracker/ballot/{{doc.obj.canonical_name}}/">[ballot]</a>:
             <ul>
-            {% for p in doc.obj.active_ballot_positions %}
+            {% for p in doc.obj.active_ballot_positions.values %}
                 {% if p.pos %}
                     {% if p.discuss %}
                         <li>

ietf/templates/iesg/scribe_doc2.html

@@ -40,7 +40,7 @@ Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
 
 {% if doc.obj.active_ballot %}
     <ul>
-    {% for p in doc.obj.active_ballot_positions %}
+    {% for p in doc.obj.active_ballot_positions.values %}
         {% if p.pos and p.discuss %}
             <li>
             <a name="{{doc.obj.name}}+{{p.ad|slugify}}+discuss">{{ p.ad }}: Discuss [{{ p.discuss_time }}]</a>:

ietf/wgcharter/tests.py

@@ -224,7 +224,7 @@ class CharterApproveBallotTestCase(django.test.TestCase):
 
         charter = Document.objects.get(name=charter.name)
         self.assertEquals(charter.get_state_slug(), "approved")
-        self.assertTrue(not ballot_open(charter, "approve"))
+        self.assertTrue(not charter.ballot_open("approve"))
 
         self.assertEquals(charter.rev, "01")
         self.assertTrue(os.path.exists(os.path.join(self.charter_dir, "charter-ietf-%s-%s.txt" % (group.acronym, charter.rev))))