Merge with trunk

 - Legacy-Id: 3676

Author: OleLaursen

django/contrib/admin/templatetags/admin_list.py

@@ -110,7 +110,10 @@ def result_headers(cl):
             # It is a non-field, but perhaps one that is sortable
             admin_order_field = getattr(attr, "admin_order_field", None)
             if not admin_order_field:
-                yield {"text": header}
+                yield {
+                    "text": header,
+                    "class_attrib": ""
+                    }
                 continue
 
             # So this _is_ a sortable non-field.  Go to the yield

ietf/announcements/admin.py

@@ -1,5 +1,6 @@
 #coding: utf-8
 from django.contrib import admin
+from django.conf import settings
 from ietf.announcements.models import *
 
 class AnnouncedFromAdmin(admin.ModelAdmin):
@@ -21,3 +22,22 @@ class ScheduledAnnouncementAdmin(admin.ModelAdmin):
     pass
 admin.site.register(ScheduledAnnouncement, ScheduledAnnouncementAdmin)
 
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    class MessageAdmin(admin.ModelAdmin):
+        list_display = ["time", "by", "subject", "groups"]
+        search_fields = ["body"]
+        raw_id_fields = ["by"]
+
+        def groups(self, instance):
+            return ", ".join(g.acronym for g in related_groups.all())
+
+    admin.site.register(Message, MessageAdmin)
+
+    class SendQueueAdmin(admin.ModelAdmin):
+        list_display = ["time", "by", "message", "send_at", "sent_at"]
+        list_filter = ["time", "send_at", "sent_at"]
+        search_fields = ["message__body"]
+        raw_id_fields = ["by"]
+
+    admin.site.register(SendQueue, SendQueueAdmin)

ietf/announcements/models.py

@@ -1,6 +1,7 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
 from django.db import models
+from django.conf import settings
 from ietf.idtracker.models import PersonOrOrgInfo, ChairsHistory
 #from django.contrib.auth.models import Permission
 
@@ -87,3 +88,43 @@ class Meta:
         db_table = 'scheduled_announcements'
 
 
+if settings.USE_DB_REDESIGN_PROXY_CLASSES or hasattr(settings, "IMPORTING_FROM_OLD_SCHEMA"):
+    import datetime
+
+    from person.models import Email, Person
+    from group.models import Group
+
+    class Message(models.Model):
+        time = models.DateTimeField(default=datetime.datetime.now)
+        by = models.ForeignKey(Person)
+
+        subject = models.CharField(max_length=255)
+        frm = models.CharField(max_length=255)
+        to = models.CharField(max_length=1024)
+        cc = models.CharField(max_length=1024, blank=True)
+        bcc = models.CharField(max_length=255, blank=True)
+        reply_to = models.CharField(max_length=255, blank=True)
+        body = models.TextField()
+        content_type = models.CharField(max_length=255, blank=True)
+
+        related_groups = models.ManyToManyField(Group, blank=True)
+
+        class Meta:
+            ordering = ['time']
+
+        def __unicode__(self):
+            return "'%s' %s -> %s" % (self.subject, self.frm, self.to)
+
+    class SendQueue(models.Model):
+        time = models.DateTimeField(default=datetime.datetime.now)
+        by = models.ForeignKey(Person)
+        
+        message = models.ForeignKey(Message)
+        
+        send_at = models.DateTimeField(blank=True, null=True)
+        sent_at = models.DateTimeField(blank=True, null=True)
+
+        note = models.TextField(blank=True)
+        
+        class Meta:
+            ordering = ['time']

ietf/announcements/send_scheduled.py

@@ -1,5 +1,7 @@
 import re, datetime, email
 
+from django.conf import settings
+
 from ietf.utils.mail import send_mail_text, send_mail_mime
 
 first_dot_on_line_re = re.compile(r'^\.', re.MULTILINE)
@@ -8,7 +10,6 @@ def send_scheduled_announcement(announcement):
     # for some reason, the old Perl code base substituted away . on line starts
     body = first_dot_on_line_re.sub("", announcement.body)
 
-    announcement.content_type
     extra = {}
     if announcement.replyto:
         extra['Reply-To'] = announcement.replyto
@@ -33,3 +34,35 @@ def send_scheduled_announcement(announcement):
     announcement.actual_sent_time = str(now.time())
     announcement.mail_sent = True
     announcement.save()
+
+
+def send_scheduled_announcementREDESIGN(send_queue):
+    message = send_queue.message
+    
+    # for some reason, the old Perl code base substituted away . on line starts
+    body = first_dot_on_line_re.sub("", message.body)
+    
+    extra = {}
+    if message.reply_to:
+        extra['Reply-To'] = message.reply_to
+
+    # announcement.content_type can contain a case-sensitive parts separator,
+    # so we need to keep it as is, not lowercased, but we want a lowercased
+    # version for the coming comparisons.
+    content_type_lowercase = message.content_type.lower()
+    if not content_type_lowercase or 'text/plain' in content_type_lowercase:
+        send_mail_text(None, message.to, message.frm, message.subject,
+                       body, cc=message.cc, bcc=message.bcc)
+    elif 'multipart' in content_type_lowercase:
+        # make body a real message so we can parse it
+        body = ("MIME-Version: 1.0\r\nContent-Type: %s\r\n" % message.content_type) + body
+        
+        msg = email.message_from_string(body.encode("utf-8"))
+        send_mail_mime(None, message.to, message.frm, message.subject,
+                       msg, cc=message.cc, bcc=message.bcc)
+
+    send_queue.sent_at = datetime.datetime.now()
+    send_queue.save()
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    send_scheduled_announcement = send_scheduled_announcementREDESIGN

ietf/announcements/tests.py

@@ -1,7 +1,11 @@
+import datetime
+
+from django.conf import settings
 import django.test
 
 from ietf.utils.test_utils import SimpleUrlTestCase, canonicalize_sitemap
-from ietf.utils.test_runner import mail_outbox
+from ietf.utils.test_data import make_test_data
+from ietf.utils.mail import outbox
 
 from ietf.announcements.models import ScheduledAnnouncement
 
@@ -27,13 +31,13 @@ def test_send_plain_announcement(self):
             content_type="",
             )
 
-        mailbox_before = len(mail_outbox)
+        mailbox_before = len(outbox)
 
         from ietf.announcements.send_scheduled import send_scheduled_announcement
         send_scheduled_announcement(a)
 
-        self.assertEquals(len(mail_outbox), mailbox_before + 1)
-        self.assertTrue("This is a test" in mail_outbox[-1]["Subject"])
+        self.assertEquals(len(outbox), mailbox_before + 1)
+        self.assertTrue("This is a test" in outbox[-1]["Subject"])
         self.assertTrue(ScheduledAnnouncement.objects.get(id=a.id).mail_sent)
 
     def test_send_mime_announcement(self):
@@ -48,12 +52,84 @@ def test_send_mime_announcement(self):
             content_type='Multipart/Mixed; Boundary="NextPart"',
             )
 
-        mailbox_before = len(mail_outbox)
+        mailbox_before = len(outbox)
 
         from ietf.announcements.send_scheduled import send_scheduled_announcement
         send_scheduled_announcement(a)
 
-        self.assertEquals(len(mail_outbox), mailbox_before + 1)
-        self.assertTrue("This is a test" in mail_outbox[-1]["Subject"])
-        self.assertTrue("--NextPart" in mail_outbox[-1].as_string())
+        self.assertEquals(len(outbox), mailbox_before + 1)
+        self.assertTrue("This is a test" in outbox[-1]["Subject"])
+        self.assertTrue("--NextPart" in outbox[-1].as_string())
         self.assertTrue(ScheduledAnnouncement.objects.get(id=a.id).mail_sent)
+
+
+class SendScheduledAnnouncementsTestCaseREDESIGN(django.test.TestCase):
+    fixtures = ["names"]
+
+    def test_send_plain_announcement(self):
+        from ietf.announcements.models import Message, SendQueue
+        from redesign.person.models import Person
+        
+        make_test_data()
+
+        msg = Message.objects.create(
+            by=Person.objects.get(name="(System)"),
+            subject="This is a test",
+            to="test@example.com",
+            frm="testmonkey@example.com",
+            cc="cc.a@example.com, cc.b@example.com",
+            bcc="bcc@example.com",
+            body="Hello World!",
+            content_type="",
+            )
+
+        q = SendQueue.objects.create(
+            by=Person.objects.get(name="(System)"),
+            message=msg,
+            send_at=datetime.datetime.now() + datetime.timedelta(hours=12)
+            )
+
+        mailbox_before = len(outbox)
+        
+        from ietf.announcements.send_scheduled import send_scheduled_announcement
+        send_scheduled_announcement(q)
+
+        self.assertEquals(len(outbox), mailbox_before + 1)
+        self.assertTrue("This is a test" in outbox[-1]["Subject"])
+        self.assertTrue(SendQueue.objects.get(id=q.id).sent_at)
+
+    def test_send_mime_announcement(self):
+        from ietf.announcements.models import Message, SendQueue
+        from redesign.person.models import Person
+        
+        make_test_data()
+
+        msg = Message.objects.create(
+            by=Person.objects.get(name="(System)"),
+            subject="This is a test",
+            to="test@example.com",
+            frm="testmonkey@example.com",
+            cc="cc.a@example.com, cc.b@example.com",
+            bcc="bcc@example.com",
+            body='--NextPart\r\n\r\nA New Internet-Draft is available from the on-line Internet-Drafts directories.\r\n--NextPart\r\nContent-Type: Message/External-body;\r\n\tname="draft-huang-behave-bih-01.txt";\r\n\tsite="ftp.ietf.org";\r\n\taccess-type="anon-ftp";\r\n\tdirectory="internet-drafts"\r\n\r\nContent-Type: text/plain\r\nContent-ID:     <2010-07-30001541.I-D@ietf.org>\r\n\r\n--NextPart--',
+            content_type='Multipart/Mixed; Boundary="NextPart"',
+            )
+
+        q = SendQueue.objects.create(
+            by=Person.objects.get(name="(System)"),
+            message=msg,
+            send_at=datetime.datetime.now() + datetime.timedelta(hours=12)
+            )
+        
+        mailbox_before = len(outbox)
+        
+        from ietf.announcements.send_scheduled import send_scheduled_announcement
+        send_scheduled_announcement(q)
+
+        self.assertEquals(len(outbox), mailbox_before + 1)
+        self.assertTrue("This is a test" in outbox[-1]["Subject"])
+        self.assertTrue("--NextPart" in outbox[-1].as_string())
+        self.assertTrue(SendQueue.objects.get(id=q.id).sent_at)
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    SendScheduledAnnouncementsTestCase = SendScheduledAnnouncementsTestCaseREDESIGN

ietf/announcements/urls.py

@@ -3,12 +3,14 @@
 from django.conf.urls.defaults import patterns
 from ietf.announcements.models import Announcement
 
+from django.conf import settings
+
 nomcom_dict = {
     'queryset': Announcement.objects.all().filter(nomcom=True)
-}
+    }
 
 urlpatterns = patterns('',
 #    (r'^nomcom/$', 'django.views.generic.simple.redirect_to', {'url': 'http://www.ietf.org/nomcom/index.html'} ),
     (r'^nomcom/$', 'ietf.announcements.views.nomcom'),
-    (r'^nomcom/(?P<object_id>\d+)/$', 'django.views.generic.list_detail.object_detail', nomcom_dict)
+    (r'^nomcom/(?P<object_id>\d+)/$', 'ietf.announcements.views.message_detail' if settings.USE_DB_REDESIGN_PROXY_CLASSES else 'django.views.generic.list_detail.object_detail', nomcom_dict)
 )

ietf/announcements/views.py

@@ -1,6 +1,11 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
 from django.views.generic.simple import direct_to_template
+from django.shortcuts import get_object_or_404
+from django.conf import settings
+from django.db.models import Q
+
+import re
 
 from ietf.idtracker.models import ChairsHistory
 from ietf.idtracker.models import Role
@@ -29,3 +34,56 @@ def nomcom(request):
                               { 'curr_chair' : curr_chair,
                                 'regimes' : regimes })
 
+def nomcomREDESIGN(request):
+    from group.models import Group
+    from ietf.announcements.models import Message
+
+    address_re = re.compile("<.*>")
+    
+    nomcoms = list(Group.objects.filter(acronym__startswith="nomcom").exclude(name="nomcom"))
+
+    regimes = []
+    
+    for n in nomcoms:
+        e = n.latest_event(type="started")
+        n.start_year = e.time.year if e else 0
+        if n.start_year <= 2003:
+            continue
+        e = n.latest_event(type="concluded")
+        n.end_year = e.time.year if e else ""
+
+        chair = n.role_set.get(name="chair").person
+        announcements = Message.objects.filter(related_groups=n).order_by('-time')
+        for a in announcements:
+            a.to_name = address_re.sub("", a.to)
+        
+        regimes.append(dict(chair=chair,
+                            announcements=announcements,
+                            group=n))
+
+    regimes.sort(key=lambda x: x["group"].start_year, reverse=True)
+
+    return direct_to_template(request,
+                              "announcements/nomcomREDESIGN.html", 
+                              { 'curr_chair' : regimes[0]["chair"],
+                                'regimes' : regimes })
+        
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    nomcom = nomcomREDESIGN
+
+
+def message_detail(request, object_id, queryset):
+    from group.models import Group
+    from ietf.announcements.models import Message
+
+    # restrict to nomcom announcements for the time being
+    nomcoms = Group.objects.filter(acronym__startswith="nomcom").exclude(acronym="nomcom")
+    m = get_object_or_404(Message, id=object_id,
+                          related_groups__in=nomcoms)
+    
+    return direct_to_template(request,
+                              "announcements/message_detail.html",
+                              dict(message=m))
+                                  
+    

ietf/bin/expire-ids

@@ -15,6 +15,6 @@ if not in_id_expire_freeze():
     for doc in get_expired_ids():
         send_expire_notice_for_id(doc)
         expire_id(doc)
-        syslog.syslog("Expired %s (id=%s)%s" % (doc.file_tag(), doc.id_document_tag, " in the ID Tracker" if doc.idinternal else ""))
+        syslog.syslog("Expired %s (id=%s)%s" % (doc.file_tag(), doc.pk, " in the ID Tracker" if doc.latest_event(type="started_iesg_process") else ""))
 
 clean_up_id_files()

ietf/bin/expire-last-calls

@@ -14,4 +14,4 @@ from ietf.idrfc.lastcall import *
 drafts = get_expired_last_calls()
 for doc in drafts:
     expire_last_call(doc)
-    syslog.syslog("Expired last call for %s (id=%s)" % (doc.file_tag(), doc.id_document_tag))
+    syslog.syslog("Expired last call for %s (id=%s)" % (doc.file_tag(), doc.pk))