Merged in ^/branch/scow/track-manual-id-posts-6.31.1.dev0, which provides secretariat support for managing draft submissions outside of the automated datatracker draft submission tool. In addition to making the secreatiat handling of draft submissions that come in by email or other paths easier, it also improves the datatracker submission and document history for these documents.

 - Legacy-Id: 11959

Author: levkowetz

ietf/doc/migrations/0014_auto_20160524_2147.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('message', '__first__'),
+        ('doc', '0013_auto_20151027_1127'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AddedMessageEvent',
+            fields=[
+                ('docevent_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='doc.DocEvent')),
+                ('msgtype', models.CharField(max_length=25)),
+                ('in_reply_to', models.ForeignKey(related_name='doc_irtomanual', blank=True, to='message.Message', null=True)),
+                ('message', models.ForeignKey(related_name='doc_manualevents', blank=True, to='message.Message', null=True)),
+            ],
+            options={
+            },
+            bases=('doc.docevent',),
+        ),
+        migrations.AlterField(
+            model_name='docevent',
+            name='type',
+            field=models.CharField(max_length=50, choices=[(b'new_revision', b'Added new revision'), (b'changed_document', b'Changed document metadata'), (b'added_comment', b'Added comment'), (b'added_message', b'Added message'), (b'deleted', b'Deleted document'), (b'changed_state', b'Changed state'), (b'changed_stream', b'Changed document stream'), (b'expired_document', b'Expired document'), (b'extended_expiry', b'Extended expiry of document'), (b'requested_resurrect', b'Requested resurrect'), (b'completed_resurrect', b'Completed resurrect'), (b'changed_consensus', b'Changed consensus'), (b'published_rfc', b'Published RFC'), (b'added_suggested_replaces', b'Added suggested replacement relationships'), (b'reviewed_suggested_replaces', b'Reviewed suggested replacement relationships'), (b'changed_group', b'Changed group'), (b'changed_protocol_writeup', b'Changed protocol writeup'), (b'changed_charter_milestone', b'Changed charter milestone'), (b'initial_review', b'Set initial review time'), (b'changed_review_announcement', b'Changed WG Review text'), (b'changed_action_announcement', b'Changed WG Action text'), (b'started_iesg_process', b'Started IESG process on document'), (b'created_ballot', b'Created ballot'), (b'closed_ballot', b'Closed ballot'), (b'sent_ballot_announcement', b'Sent ballot announcement'), (b'changed_ballot_position', b'Changed ballot position'), (b'changed_ballot_approval_text', b'Changed ballot approval text'), (b'changed_ballot_writeup_text', b'Changed ballot writeup text'), (b'changed_rfc_editor_note_text', b'Changed RFC Editor Note text'), (b'changed_last_call_text', b'Changed last call text'), (b'requested_last_call', b'Requested last call'), (b'sent_last_call', b'Sent last call'), (b'scheduled_for_telechat', b'Scheduled for telechat'), (b'iesg_approved', b'IESG approved document (no problem)'), (b'iesg_disapproved', b'IESG disapproved document (do not publish)'), (b'approved_in_minute', b'Approved in minute'), (b'iana_review', b'IANA review comment'), (b'rfc_in_iana_registry', b'RFC is in IANA registry'), (b'rfc_editor_received_announcement', b'Announcement was received by RFC Editor'), (b'requested_publication', b'Publication at RFC Editor requested')]),
+            preserve_default=True,
+        ),
+    ]

…oc/migrations/0014_auto_20160824_2218.py …oc/migrations/0015_auto_20160824_2218.pyietf/doc/migrations/0014_auto_20160824_2218.py renamed to ietf/doc/migrations/0015_auto_20160824_2218.py ietf/doc/migrations/0014_auto_20160824_2218.py renamed to ietf/doc/migrations/0015_auto_20160824_2218.py

@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('doc', '0013_auto_20151027_1127'),
+        ('doc', '0014_auto_20160524_2147'),
     ]
 
     operations = [

ietf/doc/models.py

@@ -631,6 +631,7 @@ class DocReminder(models.Model):
     ("new_revision", "Added new revision"),
     ("changed_document", "Changed document metadata"),
     ("added_comment", "Added comment"),
+    ("added_message", "Added message"),
 
     ("deleted", "Deleted document"),
 
@@ -823,6 +824,13 @@ class InitialReviewDocEvent(DocEvent):
     expires = models.DateTimeField(blank=True, null=True)
 
 
+class AddedMessageEvent(DocEvent):
+    import ietf.message.models
+    message     = models.ForeignKey(ietf.message.models.Message, null=True, blank=True,related_name='doc_manualevents')
+    msgtype     = models.CharField(max_length=25)
+    in_reply_to = models.ForeignKey(ietf.message.models.Message, null=True, blank=True,related_name='doc_irtomanual')
+
+
 # dumping store for removed events
 class DeletedEvent(models.Model):
     content_type = models.ForeignKey(ContentType)

ietf/doc/resources.py

@@ -11,7 +11,7 @@
     DocumentAuthor, DocEvent, StateDocEvent, DocHistory, ConsensusDocEvent, DocAlias,
     TelechatDocEvent, DocReminder, LastCallDocEvent, NewRevisionDocEvent, WriteupDocEvent,
     InitialReviewDocEvent, DocHistoryAuthor, BallotDocEvent, RelatedDocument,
-    RelatedDocHistory, BallotPositionDocEvent)
+    RelatedDocHistory, BallotPositionDocEvent, AddedMessageEvent)
 
 
 from ietf.name.resources import BallotPositionNameResource, DocTypeNameResource
@@ -513,3 +513,32 @@ class Meta:
         }
 api.doc.register(BallotPositionDocEventResource())
 
+
+
+from ietf.person.resources import PersonResource
+from ietf.message.resources import MessageResource
+class AddedMessageEventResource(ModelResource):
+    by               = ToOneField(PersonResource, 'by')
+    doc              = ToOneField(DocumentResource, 'doc')
+    docevent_ptr     = ToOneField(DocEventResource, 'docevent_ptr')
+    message          = ToOneField(MessageResource, 'message', null=True)
+    in_reply_to      = ToOneField(MessageResource, 'in_reply_to', null=True)
+    class Meta:
+        queryset = AddedMessageEvent.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'addedmessageevent'
+        filtering = { 
+            "id": ALL,
+            "time": ALL,
+            "type": ALL,
+            "desc": ALL,
+            "msgtype": ALL,
+            "by": ALL_WITH_RELATIONS,
+            "doc": ALL_WITH_RELATIONS,
+            "docevent_ptr": ALL_WITH_RELATIONS,
+            "message": ALL_WITH_RELATIONS,
+            "in_reply_to": ALL_WITH_RELATIONS,
+        }
+api.doc.register(AddedMessageEventResource())
+

ietf/doc/utils.py

@@ -278,6 +278,16 @@ def add_links_in_new_revision_events(doc, events, diff_revisions):
         prev = diff_url
 
 
+def add_events_message_info(events):
+    for e in events:
+        if not e.type == "added_message":
+            continue
+
+        e.message = e.addedmessageevent.message
+        e.msgtype = e.addedmessageevent.msgtype
+        e.in_reply_to = e.addedmessageevent.in_reply_to
+
+
 def get_document_content(key, filename, split=True, markup=True):
     try:
         with open(filename, 'rb') as f:

ietf/doc/views_doc.py

@@ -50,7 +50,8 @@
 from ietf.doc.utils import ( add_links_in_new_revision_events, augment_events_with_revision,
     can_adopt_draft, get_chartering_type, get_document_content, get_tags_for_stream_id,
     needed_ballot_positions, nice_consensus, prettify_std_name, update_telechat, has_same_ballot,
-    get_initial_notify, make_notify_changed_event, crawl_history, default_consensus)
+    get_initial_notify, make_notify_changed_event, crawl_history, default_consensus,
+    add_events_message_info)
 from ietf.community.utils import augment_docs_with_tracking_info
 from ietf.group.models import Role
 from ietf.group.utils import can_manage_group, can_manage_materials
@@ -657,6 +658,7 @@ def document_history(request, name):
 
     augment_events_with_revision(doc, events)
     add_links_in_new_revision_events(doc, events, diff_revisions)
+    add_events_message_info(events)
 
     # figure out if the current user can add a comment to the history
     if doc.type_id == "draft" and doc.group != None:

ietf/mailtrigger/migrations/0006_auto_20160707_1933.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+
+    Recipient=apps.get_model('mailtrigger','Recipient')
+
+    rc = Recipient.objects.create
+
+    rc(slug='submission_manualpost_handling',
+       desc='IETF manual post handling',
+       template='<ietf-manualpost@ietf.org>')
+
+
+def reverse(apps, schema_editor):
+    Recipient=apps.get_model('mailtrigger','Recipient')
+
+    Recipient.objects.filter(slug='submission_manualpost_handling').delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mailtrigger', '0005_interim_trigger'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse)
+    ]

ietf/mailtrigger/utils.py

@@ -80,6 +80,9 @@ def starts_with(prefix):
             rule_list.append((mailtrigger.slug,mailtrigger.desc,addrs.to,addrs.cc))
     return sorted(rule_list)
 
+def get_base_submission_message_address():
+    return Recipient.objects.get(slug='submission_manualpost_handling').gather()[0]
+
 def get_base_ipr_request_address():
     return Recipient.objects.get(slug='ipr_requests').gather()[0]
 

ietf/message/models.py

@@ -28,6 +28,19 @@ class Meta:
     def __unicode__(self):
         return "'%s' %s -> %s" % (self.subject, self.frm, self.to)
 
+
+class MessageAttachment(models.Model):
+    message = models.ForeignKey(Message)
+    filename = models.CharField(max_length=255, db_index=True, blank=True)
+    content_type = models.CharField(max_length=255, blank=True)
+    encoding = models.CharField(max_length=255, blank=True)
+    removed = models.BooleanField(default=False)
+    body = models.TextField()
+
+    def __unicode__(self):
+        return self.filename
+
+
 class SendQueue(models.Model):
     time = models.DateTimeField(default=datetime.datetime.now)
     by = models.ForeignKey(Person)

ietf/message/resources.py

@@ -7,12 +7,11 @@
 
 from ietf import api
 
-from ietf.message.models import Message, SendQueue
-
-
+from ietf.message.models import Message, SendQueue, MessageAttachment
 from ietf.person.resources import PersonResource
 from ietf.group.resources import GroupResource
 from ietf.doc.resources import DocumentResource
+
 class MessageResource(ModelResource):
     by               = ToOneField(PersonResource, 'by')
     related_groups   = ToManyField(GroupResource, 'related_groups', null=True)
@@ -59,3 +58,21 @@ class Meta:
         }
 api.message.register(SendQueueResource())
 
+
+
+class MessageAttachmentResource(ModelResource):
+    message          = ToOneField(MessageResource, 'message')
+    class Meta:
+        queryset = MessageAttachment.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'messageattachment'
+        filtering = { 
+            "id": ALL,
+            "filename": ALL,
+            "removed": ALL,
+            "body": ALL,
+            "message": ALL_WITH_RELATIONS,
+        }
+api.message.register(MessageAttachmentResource())
+