Merged in ^/personal/jennifer/7.39.1.dev2 from jennifer@painless-security.com:

    Create dev branch for session purpose work (from revision [19414])
    Snapshot of dev work to add session purpose annotation (from
    revision [19415])
    Allow non-WG-like groups to request additional sessions/durations and
    bypass approval (from revision [19424])
    Add 'closed' session purpose, assign purposes for nomcom groups, and update
    schedule editor to enforce timeslot type and allow blurring sessions by
    purpose (from revision [19427])
    Add management command to set up timeslots/sessions for testing/demoing
    'purpose' field (from revision [19430])
    Update session purposes and group type -> purpose map to match notes page,
    change 'session' purpose to 'regular' (from revision [19433])
    Redirect edit_schedule urls to edit_meeting_schedule view (from
    revision [19434])
    Allow hiding/blurring sessions and timeslots based on TimeSlotType in
    the schedule editor (from revision [19438])
    Disable session purpose/timeslot type hiding on schedule editor when
    only 0 or 1 options (from revision [19439])
    Improvements to the timeslot and schedule editors (move new toggles to
    modals, handle overflowing session names, fix timeslot editor scrolling,
    add buttons to quickly create single timeslot, accept trailing slash on
    edit URL) (from revision [19449])
    Update purpose/types after discussions, add on_agenda Session field,
    prevent session requests for groups with no allowed purpose, handle
    addition fields in session request, fix editing session requests, add
    session edit form/access from schedule editor, eliminate TimeSlotTypeName
    'private' field, add server-side timeslot type filtering to schedule editor
    (from revision [19549])
    Eliminate the officehours timeslot type, update/renumber migrations, mark
    offagenda/reserved TimeSlotTypeNames as not used, add a 'none'
    SessionPurposeName and disallow null, update agenda filter keywords/filter
    helpers, fix broken tests and general debugging (from revision [19550])
    Tear out old meeting schedule editor and related code (from
    revision [19551])
    Fix merge errors in preceding commits (from revision [19556])
    Add missing ifSeleniumEnabled guard for meeting.tests_js.EditTimeslotsTests
    (from revision [19592])
    Remove 'before' version of migrations that were renumbered before merge.
    (from revision [19595])
 - Legacy-Id: 19596
Note: SVN reference [19415] has been migrated to Git commit 1054f90

Note: SVN reference [19424] has been migrated to Git commit 5318081

Note: SVN reference [19427] has been migrated to Git commit 173e438

Note: SVN reference [19430] has been migrated to Git commit 7a2530a

Note: SVN reference [19433] has been migrated to Git commit 3be50d6

Note: SVN reference [19434] has been migrated to Git commit 3e3d681

Note: SVN reference [19438] has been migrated to Git commit b6ac3d4

Note: SVN reference [19439] has been migrated to Git commit 446ac7a

Note: SVN reference [19449] has been migrated to Git commit 5cbe402

Note: SVN reference [19549] has been migrated to Git commit 3dfce7b

Note: SVN reference [19550] has been migrated to Git commit 7b35c09

Note: SVN reference [19551] has been migrated to Git commit d7f2034

Note: SVN reference [19556] has been migrated to Git commit 2b1864f

Note: SVN reference [19592] has been migrated to Git commit c3f28ee

Note: SVN reference [19595] has been migrated to Git commit 83f5c7e

Author: rjsparks

hold-for-merge

@@ -1,11 +1,13 @@
 # -*- conf-mode -*-
 #
 
+
 /personal/lars/7.39.1.dev0@19495 # Hold the modal 'give us your xml' poking until bibxml service is stable 
 				 # and maybe until we have rendered previews.
 
 # Everyting below this line is OBE
 
+/personal/rjs/7.39.1.dev1@19554 # Optimization wasn't measured correctly
 /personal/rjs/7.36.1.dev0@19318 # Folded this into r19336
 /personal/rjs/7.36.1.dev0@19302 # Handled this in an earlier merge
 

ietf/doc/templatetags/ietf_filters.py

@@ -631,6 +631,93 @@ def action_holder_badge(action_holder):
     else:
         return ''  # no alert needed
 
+@register.filter
+def is_regular_agenda_item(assignment):
+    """Is this agenda item a regular session item?
+
+    A regular item appears as a sub-entry in a timeslot within the agenda
+
+    >>> from collections import namedtuple  # use to build mock objects
+    >>> mock_timeslot = namedtuple('t2', ['slug'])
+    >>> mock_assignment = namedtuple('t1', ['slot_type'])  # slot_type must be a callable
+    >>> factory = lambda t: mock_assignment(slot_type=lambda: mock_timeslot(slug=t))
+    >>> is_regular_agenda_item(factory('regular'))
+    True
+
+    >>> any(is_regular_agenda_item(factory(t)) for t in ['plenary', 'break', 'reg', 'other', 'officehours'])
+    False
+    """
+    return assignment.slot_type().slug == 'regular'
+
+@register.filter
+def is_plenary_agenda_item(assignment):
+    """Is this agenda item a regular session item?
+
+    A regular item appears as a sub-entry in a timeslot within the agenda
+
+    >>> from collections import namedtuple  # use to build mock objects
+    >>> mock_timeslot = namedtuple('t2', ['slug'])
+    >>> mock_assignment = namedtuple('t1', ['slot_type'])  # slot_type must be a callable
+    >>> factory = lambda t: mock_assignment(slot_type=lambda: mock_timeslot(slug=t))
+    >>> is_plenary_agenda_item(factory('plenary'))
+    True
+
+    >>> any(is_plenary_agenda_item(factory(t)) for t in ['regular', 'break', 'reg', 'other', 'officehours'])
+    False
+    """
+    return assignment.slot_type().slug == 'plenary'
+
+@register.filter
+def is_special_agenda_item(assignment):
+    """Is this agenda item a special item?
+
+    Special items appear as top-level agenda entries with their own timeslot information.
+
+    >>> from collections import namedtuple  # use to build mock objects
+    >>> mock_timeslot = namedtuple('t2', ['slug'])
+    >>> mock_assignment = namedtuple('t1', ['slot_type'])  # slot_type must be a callable
+    >>> factory = lambda t: mock_assignment(slot_type=lambda: mock_timeslot(slug=t))
+    >>> all(is_special_agenda_item(factory(t)) for t in ['break', 'reg', 'other', 'officehours'])
+    True
+
+    >>> any(is_special_agenda_item(factory(t)) for t in ['regular', 'plenary'])
+    False
+    """
+    return assignment.slot_type().slug in [
+        'break',
+        'reg',
+        'other',
+        'officehours',
+    ]
+
+@register.filter
+def should_show_agenda_session_buttons(assignment):
+    """Should this agenda item show the session buttons (jabber link, etc)?
+
+    In IETF-112 and earlier, office hours sessions were designated by a name ending
+    with ' office hours' and belonged to the IESG or some other group. This led to
+    incorrect session buttons being displayed. Suppress session buttons for
+    when name ends with 'office hours' in the pre-112 meetings.
+    >>> from collections import namedtuple  # use to build mock objects
+    >>> mock_meeting = namedtuple('t3', ['number'])
+    >>> mock_session = namedtuple('t2', ['name'])
+    >>> mock_assignment = namedtuple('t1', ['meeting', 'session'])  # meeting must be a callable
+    >>> factory = lambda num, name: mock_assignment(session=mock_session(name), meeting=lambda: mock_meeting(num))
+    >>> test_cases = [('105', 'acme office hours'), ('112', 'acme office hours')]
+    >>> any(should_show_agenda_session_buttons(factory(*tc)) for tc in test_cases)
+    False
+    >>> test_cases = [('interim-2020-acme-113', 'acme'), ('113', 'acme'), ('150', 'acme'), ('105', 'acme'),]
+    >>> test_cases.extend([('112', 'acme'), ('interim-2020-acme-113', 'acme office hours')])
+    >>> test_cases.extend([('113', 'acme office hours'), ('150', 'acme office hours')])
+    >>> all(should_show_agenda_session_buttons(factory(*tc)) for tc in test_cases)
+    True
+    """
+    num = assignment.meeting().number
+    if num.isdigit() and int(num) <= settings.MEETING_LEGACY_OFFICE_HOURS_END:
+        return not assignment.session.name.lower().endswith(' office hours')
+    else:
+        return True
+
 
 @register.simple_tag
 def absurl(viewname, **kwargs):

ietf/doc/tests.py

@@ -40,7 +40,7 @@
 from ietf.group.models import Group
 from ietf.group.factories import GroupFactory, RoleFactory
 from ietf.ipr.factories import HolderIprDisclosureFactory
-from ietf.meeting.models import Meeting, Session, SessionPresentation, SchedulingEvent
+from ietf.meeting.models import Meeting, SessionPresentation, SchedulingEvent
 from ietf.meeting.factories import ( MeetingFactory, SessionFactory, SessionPresentationFactory,
      ProceedingsMaterialFactory )
 
@@ -1465,12 +1465,12 @@ def test_document_material(self):
         )
         doc.set_state(State.objects.get(type="slides", slug="active"))
 
-        session = Session.objects.create(
+        session = SessionFactory(
             name = "session-72-mars-1",
             meeting = Meeting.objects.get(number='72'),
             group = Group.objects.get(acronym='mars'),
             modified = datetime.datetime.now(),
-            type_id = 'regular',
+            add_to_schedule=False,
         )
         SchedulingEvent.objects.create(
             session=session,

ietf/doc/tests_material.py

@@ -18,8 +18,8 @@
 from ietf.doc.models import Document, State, DocAlias, NewRevisionDocEvent
 from ietf.group.factories import RoleFactory
 from ietf.group.models import Group
-from ietf.meeting.factories import MeetingFactory
-from ietf.meeting.models import Meeting, Session, SessionPresentation, SchedulingEvent
+from ietf.meeting.factories import MeetingFactory, SessionFactory
+from ietf.meeting.models import Meeting, SessionPresentation, SchedulingEvent
 from ietf.name.models import SessionStatusName
 from ietf.person.models import Person
 from ietf.utils.test_utils import TestCase, login_testing_unauthorized
@@ -151,12 +151,11 @@ def test_edit_title(self):
     def test_revise(self):
         doc = self.create_slides()
 
-        session = Session.objects.create(
+        session = SessionFactory(
             name = "session-42-mars-1",
             meeting = Meeting.objects.get(number='42'),
             group = Group.objects.get(acronym='mars'),
             modified = datetime.datetime.now(),
-            type_id='regular',
         )
         SchedulingEvent.objects.create(
             session=session,

ietf/group/admin.py

@@ -188,6 +188,7 @@ class GroupFeaturesAdmin(admin.ModelAdmin):
         'customize_workflow',
         'is_schedulable',
         'show_on_agenda',
+        'agenda_filter_type',
         'req_subm_approval',
         'agenda_type',
         'material_types',

ietf/group/migrations/0050_groupfeatures_agenda_filter_type.py

@@ -0,0 +1,20 @@
+# Copyright The IETF Trust 2021 All Rights Reserved
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('name', '0033_populate_agendafiltertypename'),
+        ('group', '0049_auto_20211019_1136'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='groupfeatures',
+            name='agenda_filter_type',
+            field=models.ForeignKey(default='none', on_delete=django.db.models.deletion.PROTECT, to='name.AgendaFilterTypeName'),
+        ),
+    ]

ietf/group/migrations/0051_populate_groupfeatures_agenda_filter_type.py

@@ -0,0 +1,35 @@
+# Copyright The IETF Trust 2021 All Rights Reserved
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    GroupFeatures = apps.get_model('group', 'GroupFeatures')
+
+    # map AgendaFilterTypeName slug to group types - unlisted get 'none'
+    filter_types = dict(
+        # list previously hard coded in agenda view, plus 'review'
+        normal={'wg', 'ag', 'rg', 'rag', 'iab', 'program', 'review'},
+        heading={'area', 'ietf', 'irtf'},
+        special={'team', 'adhoc'},
+    )
+
+    for ft, group_types in filter_types.items():
+        for gf in GroupFeatures.objects.filter(type__slug__in=group_types):
+            gf.agenda_filter_type_id = ft
+            gf.save()
+
+
+def reverse(apps, schema_editor):
+    pass  # nothing to do, model will be deleted anyway
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group', '0050_groupfeatures_agenda_filter_type'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]

ietf/group/migrations/0052_groupfeatures_session_purposes.py

@@ -0,0 +1,24 @@
+# Copyright The IETF Trust 2021 All Rights Reserved
+
+# Generated by Django 2.2.24 on 2021-09-26 11:29
+
+from django.db import migrations
+import ietf.group.models
+import ietf.name.models
+import jsonfield.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group', '0051_populate_groupfeatures_agenda_filter_type'),
+        ('name', '0034_sessionpurposename'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='groupfeatures',
+            name='session_purposes',
+            field=jsonfield.fields.JSONField(default=[], help_text='Allowed session purposes for this group type', max_length=256, validators=[ietf.group.models.JSONForeignKeyListValidator(ietf.name.models.SessionPurposeName)]),
+        ),
+    ]

ietf/group/migrations/0053_populate_groupfeatures_session_purposes.py

@@ -0,0 +1,64 @@
+# Copyright The IETF Trust 2021 All Rights Reserved
+
+# Generated by Django 2.2.24 on 2021-09-26 11:29
+
+from django.db import migrations
+
+
+default_purposes = dict(
+    adhoc=['presentation'],
+    adm=['closed_meeting', 'officehours'],
+    ag=['regular'],
+    area=['regular'],
+    dir=['open_meeting', 'presentation', 'regular', 'social', 'tutorial'],
+    iab=['closed_meeting', 'regular'],
+    iabasg=['closed_meeting', 'officehours', 'open_meeting'],
+    iana=['officehours'],
+    iesg=['closed_meeting', 'open_meeting'],
+    ietf=['admin', 'plenary', 'presentation', 'social'],
+    irtf=[],
+    ise=['officehours'],
+    isoc=['officehours', 'open_meeting', 'presentation'],
+    nomcom=['closed_meeting', 'officehours'],
+    program=['regular', 'tutorial'],
+    rag=['regular'],
+    review=['open_meeting', 'social'],
+    rfcedtyp=['officehours'],
+    rg=['regular'],
+    team=['coding', 'presentation', 'social', 'tutorial'],
+    wg=['regular'],
+)
+
+
+def forward(apps, schema_editor):
+    GroupFeatures = apps.get_model('group', 'GroupFeatures')
+    SessionPurposeName = apps.get_model('name', 'SessionPurposeName')
+
+    # verify that we're not about to use an invalid purpose
+    for purposes in default_purposes.values():
+        for purpose in purposes:
+            SessionPurposeName.objects.get(pk=purpose)  # throws an exception unless exists
+
+    for type_, purposes in default_purposes.items():
+        GroupFeatures.objects.filter(
+            type=type_
+        ).update(
+            session_purposes=purposes
+        )
+
+def reverse(apps, schema_editor):
+    GroupFeatures = apps.get_model('group', 'GroupFeatures')
+    GroupFeatures.objects.update(session_purposes=[])  # clear back out to default
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group', '0052_groupfeatures_session_purposes'),
+        ('name', '0035_populate_sessionpurposename'),
+
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]

ietf/group/models.py

@@ -8,25 +8,23 @@
 import os
 import re
 
-from urllib.parse import urljoin
-
 from django.conf import settings
 from django.core.validators import RegexValidator
 from django.db import models
-from django.db.models.deletion import CASCADE
+from django.db.models.deletion import CASCADE, PROTECT
 from django.dispatch import receiver
 
-#from simple_history.models import HistoricalRecords
-
 import debug                            # pyflakes:ignore
 
 from ietf.group.colors import fg_group_colors, bg_group_colors
-from ietf.name.models import GroupStateName, GroupTypeName, DocTagName, GroupMilestoneStateName, RoleName, AgendaTypeName, ExtResourceName
+from ietf.name.models import (GroupStateName, GroupTypeName, DocTagName, GroupMilestoneStateName, RoleName,
+                              AgendaTypeName, AgendaFilterTypeName, ExtResourceName, SessionPurposeName)
 from ietf.person.models import Email, Person
 from ietf.utils.db import IETFJSONField
 from ietf.utils.mail import formataddr, send_mail_text
 from ietf.utils import log
 from ietf.utils.models import ForeignKey, OneToOneField
+from ietf.utils.validators import JSONForeignKeyListValidator
 
 
 class GroupInfo(models.Model):
@@ -167,30 +165,6 @@ def fg_color(self):
     def bg_color(self):
         return bg_group_colors[self.upcase_acronym]
 
-    def json_url(self):
-        return "/group/%s.json" % (self.acronym,)
-
-    def json_dict(self, host_scheme):
-        group1= dict()
-        group1['href'] = urljoin(host_scheme, self.json_url())
-        group1['acronym'] = self.acronym
-        group1['name']    = self.name
-        group1['state']   = self.state.slug
-        group1['type']    = self.type.slug
-        if self.parent is not None:
-            group1['parent_href']  = urljoin(host_scheme, self.parent.json_url())
-        # uncomment when people URL handle is created
-        try:
-            if self.ad_role() is not None:
-                group1['ad_href']      = urljoin(host_scheme, self.ad_role().person.json_url())
-        except Person.DoesNotExist:
-            pass
-        group1['list_email'] = self.list_email
-        group1['list_subscribe'] = self.list_subscribe
-        group1['list_archive'] = self.list_archive
-        group1['comments']     = self.comments
-        return group1
-
     def liaison_approvers(self):
         '''Returns roles that have liaison statement approval authority for group'''
 
@@ -248,6 +222,7 @@ def get_description(self):
     code='invalid',
 )
 
+
 class GroupFeatures(models.Model):
     type = OneToOneField(GroupTypeName, primary_key=True, null=False, related_name='features')
     #history = HistoricalRecords()
@@ -275,6 +250,7 @@ class GroupFeatures(models.Model):
     customize_workflow      = models.BooleanField("Workflow",   default=False)
     is_schedulable          = models.BooleanField("Schedulable",default=False)
     show_on_agenda          = models.BooleanField("On Agenda",  default=False)
+    agenda_filter_type      = models.ForeignKey(AgendaFilterTypeName, default='none', on_delete=PROTECT)
     req_subm_approval       = models.BooleanField("Subm. Approval",  default=False)
     #
     agenda_type             = models.ForeignKey(AgendaTypeName, null=True, default="ietf", on_delete=CASCADE)
@@ -289,6 +265,9 @@ class GroupFeatures(models.Model):
     matman_roles            = IETFJSONField(max_length=128, accepted_empty_values=[[], {}], blank=False, default=["ad","chair","delegate","secr"])
     role_order              = IETFJSONField(max_length=128, accepted_empty_values=[[], {}], blank=False, default=["chair","secr","member"],
                                                 help_text="The order in which roles are shown, for instance on photo pages.  Enter valid JSON.")
+    session_purposes        = IETFJSONField(max_length=256, accepted_empty_values=[[], {}], blank=False, default=[],
+                                                  help_text="Allowed session purposes for this group type",
+                                                  validators=[JSONForeignKeyListValidator(SessionPurposeName)])
 
 
 class GroupHistory(GroupInfo):