Allows the secretariat to manage more meeting types, including leadership meetings.

Backfills those types of meetings from IETF91 and IETF92.
Addresses several facelift issues in the meeting application.
Commit ready for merge.
 - Legacy-Id: 9603

Author: rjsparks

ietf/bin/create-break-sessions

@@ -22,8 +22,8 @@ scheduled = SessionStatusName.objects.get(slug='sched')
 
 for meeting in Meeting.objects.filter(type="ietf").order_by("date"):
     print "Checking %s schedules ..." % meeting
-    brk, __ = Session.objects.get_or_create(meeting=meeting, group=secretariat, requested_by=system, status=scheduled, name='Break', )
-    reg, __ = Session.objects.get_or_create(meeting=meeting, group=secretariat, requested_by=system, status=scheduled, name='Registration', )
+    brk, __ = Session.objects.get_or_create(meeting=meeting, group=secretariat, requested_by=system, status=scheduled, name='Break', type_id='break',)
+    reg, __ = Session.objects.get_or_create(meeting=meeting, group=secretariat, requested_by=system, status=scheduled, name='Registration', type_id='reg',)
 
     for schedule in meeting.schedule_set.all():
         print "  Checking for missing Break and Reg sessions in %s" % schedule

ietf/doc/tests.py

@@ -527,6 +527,7 @@ def test_document_material(self):
             status = SessionStatusName.objects.create(slug='scheduled', name='Scheduled'),
             modified = datetime.datetime.now(),
             requested_by = Person.objects.get(user__username="marschairman"),
+            type_id = "session",
             )
         SessionPresentation.objects.create(session=session, document=doc, rev=doc.rev)
 

ietf/doc/tests_material.py

@@ -148,6 +148,7 @@ def test_revise(self):
             status = SessionStatusName.objects.create(slug='scheduled', name='Scheduled'),
             modified = datetime.datetime.now(),
             requested_by = Person.objects.get(user__username="marschairman"),
+            type_id="session",
             )
         SessionPresentation.objects.create(session=session, document=doc, rev=doc.rev)
 

ietf/group/migrations/0004_auto_20150430_0847.py

@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group', '0003_auto_20150304_0743'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='group',
+            name='unused_states',
+            field=models.ManyToManyField(help_text=b'Document states that have been disabled for the group.', to='doc.State', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='group',
+            name='unused_tags',
+            field=models.ManyToManyField(help_text=b'Document tags that have been disabled for the group.', to='name.DocTagName', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='grouphistory',
+            name='unused_states',
+            field=models.ManyToManyField(help_text=b'Document states that have been disabled for the group.', to='doc.State', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='grouphistory',
+            name='unused_tags',
+            field=models.ManyToManyField(help_text=b'Document tags that have been disabled for the group.', to='name.DocTagName', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='groupmilestone',
+            name='resolved',
+            field=models.CharField(help_text=b'Explanation of why milestone is resolved (usually "Done"), or empty if still due.', max_length=50, blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='groupmilestonehistory',
+            name='resolved',
+            field=models.CharField(help_text=b'Explanation of why milestone is resolved (usually "Done"), or empty if still due.', max_length=50, blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='role',
+            name='email',
+            field=models.ForeignKey(help_text=b'Email address used by person for this role.', to='person.Email'),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='rolehistory',
+            name='email',
+            field=models.ForeignKey(help_text=b'Email address used by person for this role.', to='person.Email'),
+            preserve_default=True,
+        ),
+    ]

ietf/group/migrations/0005_auto_20150504_0726.py

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+def create_iab_roles(apps, schema_editor):
+    Role = apps.get_model('group','Role')
+    Group = apps.get_model('group','Group')
+    Person = apps.get_model('person','Person')
+
+    iab = Group.objects.get(acronym='iab')
+
+    iab_names = [
+                  'Jari Arkko',
+                  'Mary Barnes',
+                  'Marc Blanchet',
+                  'Ralph Droms',
+                  'Ted Hardie',
+                  'Joe Hildebrand',
+                  'Russ Housley',
+                  'Erik Nordmark',
+                  'Robert Sparks',
+                  'Andrew Sullivan',
+                  'Dave Thaler',
+                  'Brian Trammell',
+                  'Suzanne Woolf',
+                ]
+   
+    for name in iab_names:
+        person = Person.objects.get(name=name)
+        person.role_set.add(Role(name_id='member',group=iab,person=person,email_id=person.email_set.filter(active=True).order_by('-time').first().address))
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group', '0004_auto_20150430_0847'),
+    ]
+
+    operations = [
+        migrations.RunPython(create_iab_roles),
+    ]

ietf/ietfauth/utils.py

@@ -46,6 +46,7 @@ def has_role(user, role_names, *args, **kwargs):
         role_qs = {
 	    "Area Director": Q(person=person, name__in=("pre-ad", "ad"), group__type="area", group__state="active"),
 	    "Secretariat": Q(person=person, name="secr", group__acronym="secretariat"),
+            "IAB" : Q(person=person, name="member", group__acronym="iab"),
 	    "IANA": Q(person=person, name="auth", group__acronym="iana"),
             "RFC Editor": Q(person=person, name="auth", group__acronym="rfceditor"),
             "ISE" : Q(person=person, name="chair", group__acronym="ise"),

ietf/ipr/migrations/0003_auto_20150430_0847.py

@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ipr', '0002_remove_legacy_models'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='genericiprdisclosure',
+            name='holder_contact_info',
+            field=models.TextField(help_text=b'Address, phone, etc.', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='holderiprdisclosure',
+            name='holder_contact_info',
+            field=models.TextField(help_text=b'Address, phone, etc.', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='iprdisclosurebase',
+            name='compliant',
+            field=models.BooleanField(default=True, verbose_name=b'Complies to RFC3979'),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='iprdisclosurebase',
+            name='notes',
+            field=models.TextField(verbose_name=b'Additional notes', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='iprdisclosurebase',
+            name='other_designations',
+            field=models.CharField(max_length=255, verbose_name=b'Designations for other contributions', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='nondocspecificiprdisclosure',
+            name='holder_contact_info',
+            field=models.TextField(help_text=b'Address, phone, etc.', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='thirdpartyiprdisclosure',
+            name='ietfer_contact_info',
+            field=models.TextField(help_text=b'Address, phone, etc.', blank=True),
+            preserve_default=True,
+        ),
+    ]

ietf/meeting/ajax.py

@@ -158,6 +158,8 @@ def timeslot_roomurl(request, num=None, roomid=None):
 # no authorization required to list.
 def timeslot_slotlist(request, mtg):
     slots = mtg.timeslot_set.all()
+    # Restrict graphical editing to slots of type 'session' for now
+    slots = slots.filter(type__slug='session')
     json_array=[]
     for slot in slots:
         json_array.append(slot.json_dict(request.build_absolute_uri('/')))

ietf/meeting/helpers.py

@@ -66,7 +66,7 @@ def build_all_agenda_slices(meeting):
     time_slices = []
     date_slices = {}
 
-    for ts in meeting.timeslot_set.exclude(type__in=['reg','break']).order_by('time','name'):
+    for ts in meeting.timeslot_set.filter(type__in=['session',]).order_by('time','name'):
             ymd = ts.time.date()
 
             if ymd not in date_slices and ts.location != None:
@@ -80,13 +80,10 @@ def build_all_agenda_slices(meeting):
     time_slices.sort()
     return time_slices,date_slices
 
-def get_scheduledsessions_from_schedule(schedule):
-   ss = schedule.scheduledsession_set.filter(timeslot__location__isnull = False).exclude(session__isnull = True).order_by('timeslot__time','timeslot__name','session__group__group')
-
-   return ss
-
 def get_all_scheduledsessions_from_schedule(schedule):
-   ss = schedule.scheduledsession_set.filter(timeslot__location__isnull = False).order_by('timeslot__time','timeslot__name')
+   ss = schedule.scheduledsession_set.filter(timeslot__location__isnull = False)
+   ss = ss.filter(session__type__slug='session')
+   ss = ss.order_by('timeslot__time','timeslot__name')
 
    return ss
 

ietf/meeting/migrations/0005_auto_20150430_0847.py

@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0004_auto_20150308_0446'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='meeting',
+            name='agenda_note',
+            field=models.TextField(help_text=b'Text in this field will be placed at the top of the html agenda page for the meeting.  HTML can be used, but will not be validated.', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='schedule',
+            name='public',
+            field=models.BooleanField(default=True, help_text='Make this agenda publically available.'),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='schedule',
+            name='visible',
+            field=models.BooleanField(default=True, help_text='Make this agenda available to those who know about it.'),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='scheduledsession',
+            name='extendedfrom',
+            field=models.ForeignKey(default=None, to='meeting.ScheduledSession', help_text='Timeslot this session is an extension of.', null=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='scheduledsession',
+            name='pinned',
+            field=models.BooleanField(default=False, help_text=b'Do not move session during automatic placement.'),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='scheduledsession',
+            name='session',
+            field=models.ForeignKey(default=None, to='meeting.Session', help_text='Scheduled session.', null=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='session',
+            name='name',
+            field=models.CharField(help_text=b'Name of session, in case the session has a purpose rather than just being a group meeting.', max_length=255, blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='session',
+            name='short',
+            field=models.CharField(help_text=b"Short version of 'name' above, for use in filenames.", max_length=32, blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='timeslot',
+            name='sessions',
+            field=models.ManyToManyField(related_name='slots', to='meeting.Session', through='meeting.ScheduledSession', blank=True, help_text='Scheduled session, if any.', null=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='timeslot',
+            name='show_location',
+            field=models.BooleanField(default=True, help_text=b'Show location in agenda.'),
+            preserve_default=True,
+        ),
+    ]