Move chartering groups to /group/chartering/ (with a redirect from the old location), list RGs there too, and amend the previous fix to the chartering process for non-WGs so they have internal and external review states instead of just approved. Also move the code in wginfo/ to group/ as it is no longer just about info for WGs.

 - Legacy-Id: 7556

Author: OleLaursen

ietf/bin/send-milestone-reminders

@@ -11,7 +11,7 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
 
 syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_LOCAL0)
 
-from ietf.wginfo.mails import *
+from ietf.group.mails import *
 
 today = datetime.date.today()
 

ietf/doc/views_charter.py

@@ -30,7 +30,7 @@
 from ietf.utils.history import find_history_active_at
 from ietf.utils.mail import send_mail_preformatted
 from ietf.utils.textupload import get_cleaned_text_file_content
-from ietf.wginfo.mails import email_secretariat
+from ietf.group.mails import email_secretariat
 
 
 class ChangeStateForm(forms.Form):
@@ -46,7 +46,7 @@ def __init__(self, *args, **kwargs):
         if group.type_id == "wg":
             state_field.queryset = state_field.queryset.filter(slug__in=("infrev", "intrev", "extrev", "iesgrev"))
         else:
-            state_field.queryset = state_field.queryset.filter(slug__in=("notrev", "approved"))
+            state_field.queryset = state_field.queryset.filter(slug__in=("intrev", "extrev", "approved"))
         # hide requested fields
         if self.hide:
             for f in self.hide:
@@ -147,7 +147,7 @@ def change_state(request, name, option=None):
 
                 email_state_changed(request, charter, "State changed to %s." % charter_state)
 
-                if charter_state.slug == "intrev":
+                if charter_state.slug == "intrev" and group.type_id == "wg":
                     if request.POST.get("ballot_wo_extern"):
                         create_ballot_if_not_open(charter, login, "r-wo-ext")
                     else:
@@ -198,13 +198,15 @@ def change_state(request, name, option=None):
     def state_pk(slug):
         return State.objects.get(used=True, type="charter", slug=slug).pk
 
-    info_msg = {
-        state_pk("infrev"): 'The %s "%s" (%s) has been set to Informal IESG review by %s.' % (group.type.name, group.name, group.acronym, login.plain_name()),
-        state_pk("intrev"): 'The %s "%s" (%s) has been set to Internal review by %s.\nPlease place it on the next IESG telechat and inform the IAB.' % (group.type.name, group.name, group.acronym, login.plain_name()),
-        state_pk("extrev"): 'The %s "%s" (%s) has been set to External review by %s.\nPlease send out the external review announcement to the appropriate lists.\n\nSend the announcement to other SDOs: Yes\nAdditional recipients of the announcement: ' % (group.type.name, group.name, group.acronym, login.plain_name()),
-        }
+    info_msg = {}
+    if group.type_id == "wg":
+        info_msg[state_pk("infrev")] = 'The %s "%s" (%s) has been set to Informal IESG review by %s.' % (group.type.name, group.name, group.acronym, login.plain_name())
+        info_msg[state_pk("intrev")] = 'The %s "%s" (%s) has been set to Internal review by %s.\nPlease place it on the next IESG telechat and inform the IAB.' % (group.type.name, group.name, group.acronym, login.plain_name())
+        info_msg[state_pk("extrev")] = 'The %s "%s" (%s) has been set to External review by %s.\nPlease send out the external review announcement to the appropriate lists.\n\nSend the announcement to other SDOs: Yes\nAdditional recipients of the announcement: ' % (group.type.name, group.name, group.acronym, login.plain_name())
 
-    states_for_ballot_wo_extern = State.objects.filter(used=True, type="charter", slug="intrev").values_list("pk", flat=True)
+    states_for_ballot_wo_extern = State.objects.none()
+    if group.type_id == "wg":
+        states_for_ballot_wo_extern = State.objects.filter(used=True, type="charter", slug="intrev").values_list("pk", flat=True)
 
     return render_to_response('doc/charter/change_state.html',
                               dict(form=form,

ietf/feed_urls.py

@@ -2,7 +2,7 @@
 from django.views.generic import RedirectView
 
 from ietf.doc.feeds import DocumentChangesFeed, InLastCallFeed
-from ietf.wginfo.feeds import GroupChangesFeed
+from ietf.group.feeds import GroupChangesFeed
 from ietf.iesg.feeds import IESGAgendaFeed
 from ietf.ipr.feeds import LatestIprDisclosuresFeed
 from ietf.liaisons.feeds import LiaisonStatementsFeed

ietf/wginfo/edit.py ietf/group/edit.pyietf/wginfo/edit.py renamed to ietf/group/edit.py

@@ -22,7 +22,7 @@
 from ietf.ietfauth.utils import has_role
 from ietf.person.forms import EmailsField
 from ietf.person.models import Person, Email
-from ietf.wginfo.mails import email_secretariat
+from ietf.group.mails import email_secretariat
 
 MAX_GROUP_DELEGATES = 3
 
@@ -170,7 +170,7 @@ def submit_initial_charter(request, group_type, acronym=None):
     return redirect('charter_submit', name=group.charter.name, option="initcharter")
 
 @login_required
-def edit(request, group_type, acronym=None, action="edit"):
+def edit(request, group_type=None, acronym=None, action="edit"):
     """Edit or create a group, notifying parties as
     necessary and logging changes as group events."""
     if not can_manage_group_type(request.user, group_type):
@@ -314,7 +314,7 @@ def diff(attr, name):
                         )
         form = GroupForm(initial=init, group=group, group_type=group_type)
 
-    return render(request, 'wginfo/edit.html',
+    return render(request, 'group/edit.html',
                   dict(group=group,
                        form=form,
                        action=action))
@@ -348,7 +348,7 @@ def conclude(request, group_type, acronym):
     else:
         form = ConcludeForm()
 
-    return render(request, 'wginfo/conclude.html',
+    return render(request, 'group/conclude.html',
                   dict(form=form, group=group))
 
 
@@ -382,7 +382,7 @@ def customize_workflow(request, group_type, acronym):
 
             # redirect so the back button works correctly, otherwise
             # repeated POSTs fills up the history
-            return redirect("ietf.wginfo.edit.customize_workflow", group_type=group.type_id, acronym=group.acronym)
+            return redirect("ietf.group.edit.customize_workflow", group_type=group.type_id, acronym=group.acronym)
 
         if action == "setnextstates":
             try:
@@ -399,7 +399,7 @@ def customize_workflow(request, group_type, acronym):
                 transitions, _ = GroupStateTransitions.objects.get_or_create(group=group, state=state)
                 transitions.next_states = next_states
 
-            return redirect("ietf.wginfo.edit.customize_workflow", group_type=group.type_id, acronym=group.acronym)
+            return redirect("ietf.group.edit.customize_workflow", group_type=group.type_id, acronym=group.acronym)
 
         if action == "settagactive":
             active = request.POST.get("active") == "1"
@@ -413,7 +413,7 @@ def customize_workflow(request, group_type, acronym):
             else:
                 group.unused_tags.add(tag)
 
-            return redirect("ietf.wginfo.edit.customize_workflow", group_type=group.type_id, acronym=group.acronym)
+            return redirect("ietf.group.edit.customize_workflow", group_type=group.type_id, acronym=group.acronym)
 
     # put some info for the template on tags and states
     unused_tags = group.unused_tags.all().values_list('slug', flat=True)
@@ -437,7 +437,7 @@ def customize_workflow(request, group_type, acronym):
         s.next_states_checkboxes = [(x in n, x in default_n, x) for x in states]
         s.used_next_states = [x for x in n if x.slug not in unused_states]
 
-    return render(request, 'wginfo/customize_workflow.html', {
+    return render(request, 'group/customize_workflow.html', {
             'group': group,
             'states': states,
             'tags': tags,

ietf/wginfo/feeds.py ietf/group/feeds.pyietf/wginfo/feeds.py renamed to ietf/group/feeds.py

@@ -11,7 +11,7 @@
 
 class GroupChangesFeed(Feed):
     feed_type = Atom1Feed
-    description_template = "wginfo/feed_item_description.html"
+    description_template = "group/feed_item_description.html"
 
     def get_object(self, request, acronym):
         return Group.objects.get(acronym=acronym)

ietf/wginfo/views.py ietf/group/info.pyietf/wginfo/views.py renamed to ietf/group/info.py

@@ -49,6 +49,7 @@
 from ietf.doc.utils import get_chartering_type
 from ietf.doc.templatetags.ietf_filters import clean_whitespace
 from ietf.group.models import Group, Role
+from ietf.name.models import GroupTypeName
 from ietf.group.utils import get_charter_text, can_manage_group_type, milestone_reviewer_for_group_type
 from ietf.utils.pipe import pipe
 
@@ -96,7 +97,7 @@ def wg_summary_area(request, group_type):
 
     areas = [a for a in areas if a.groups]
 
-    return render(request, 'wginfo/1wg-summary.txt',
+    return render(request, 'group/1wg-summary.txt',
                   { 'areas': areas },
                   content_type='text/plain; charset=UTF-8')
 
@@ -107,7 +108,7 @@ def wg_summary_acronym(request, group_type):
     groups = Group.objects.filter(type="wg", state="active").order_by("acronym").select_related("parent")
     for group in groups:
         group.chairs = sorted(roles(group, "chair"), key=extract_last_name)
-    return render(request, 'wginfo/1wg-summary-by-acronym.txt',
+    return render(request, 'group/1wg-summary-by-acronym.txt',
                   { 'areas': areas,
                     'groups': groups },
                   content_type='text/plain; charset=UTF-8')
@@ -122,7 +123,7 @@ def wg_charters(request, group_type):
         for group in area.groups:
             fill_in_charter_info(group, include_drafts=True)
             group.area = area
-    return render(request, 'wginfo/1wg-charters.txt',
+    return render(request, 'group/1wg-charters.txt',
                   { 'areas': areas },
                   content_type='text/plain; charset=UTF-8')
 
@@ -138,7 +139,7 @@ def wg_charters_by_acronym(request, group_type):
     for group in groups:
         fill_in_charter_info(group, include_drafts=True)
         group.area = areas.get(group.parent_id)
-    return render(request, 'wginfo/1wg-charters-by-acronym.txt',
+    return render(request, 'group/1wg-charters-by-acronym.txt',
                   { 'groups': groups },
                   content_type='text/plain; charset=UTF-8')
 
@@ -162,7 +163,7 @@ def active_wgs(request):
         for group in area.groups:
             group.chairs = sorted(roles(group, "chair"), key=extract_last_name)
 
-    return render(request, 'wginfo/active_wgs.html', { 'areas':areas })
+    return render(request, 'group/active_wgs.html', { 'areas':areas })
 
 def active_rgs(request):
     irtf = Group.objects.get(acronym="irtf")
@@ -172,25 +173,27 @@ def active_rgs(request):
     for group in groups:
         group.chairs = sorted(roles(group, "chair"), key=extract_last_name)
 
-    return render(request, 'wginfo/active_rgs.html', { 'irtf': irtf, 'groups': groups })
+    return render(request, 'group/active_rgs.html', { 'irtf': irtf, 'groups': groups })
 
 def bofs(request, group_type):
     groups = Group.objects.filter(type=group_type, state="bof")
-    return render(request, 'wginfo/bofs.html',dict(groups=groups))
-
-def chartering_groups(request, group_type):
-    if group_type != "wg":
-        raise Http404
+    return render(request, 'group/bofs.html',dict(groups=groups))
 
+def chartering_groups(request):
     charter_states = State.objects.filter(used=True, type="charter").exclude(slug__in=("approved", "notrev"))
-    groups = Group.objects.filter(type=group_type, charter__states__in=charter_states).select_related("state", "charter")
 
-    for g in groups:
-        g.chartering_type = get_chartering_type(g.charter)
+    group_types = GroupTypeName.objects.filter(slug__in=("wg", "rg"))
+
+    for t in group_types:
+        t.chartering_groups = Group.objects.filter(type=t, charter__states__in=charter_states).select_related("state", "charter")
+        t.can_manage = can_manage_group_type(request.user, t)
+
+        for g in t.chartering_groups:
+            g.chartering_type = get_chartering_type(g.charter)
 
-    return render(request, 'wginfo/chartering_groups.html',
+    return render(request, 'group/chartering_groups.html',
                   dict(charter_states=charter_states,
-                       groups=groups))
+                       group_types=group_types))
 
 
 def construct_group_menu_context(request, group, selected, others):
@@ -207,10 +210,10 @@ def construct_group_menu_context(request, group, selected, others):
         actions.append((u"Edit group", urlreverse("group_edit", kwargs=dict(group_type=group.type_id, acronym=group.acronym))))
 
     if is_chair or can_manage:
-        actions.append((u"Customize workflow", urlreverse("ietf.wginfo.edit.customize_workflow", kwargs=dict(group_type=group.type_id, acronym=group.acronym))))
+        actions.append((u"Customize workflow", urlreverse("ietf.group.edit.customize_workflow", kwargs=dict(group_type=group.type_id, acronym=group.acronym))))
 
     if group.state_id in ("active", "dormant") and can_manage:
-        actions.append((u"Request closing group", urlreverse("ietf.wginfo.edit.conclude", kwargs=dict(group_type=group.type_id, acronym=group.acronym))))
+        actions.append((u"Request closing group", urlreverse("ietf.group.edit.conclude", kwargs=dict(group_type=group.type_id, acronym=group.acronym))))
 
     d = {
         "group": group,
@@ -260,7 +263,7 @@ def group_documents(request, group_type, acronym):
 
     docs, meta, docs_related, meta_related = search_for_group_documents(group)
 
-    return render(request, 'wginfo/group_documents.html',
+    return render(request, 'group/group_documents.html',
                   construct_group_menu_context(request, group, "documents", {
                 'docs': docs,
                 'meta': meta,
@@ -309,7 +312,7 @@ def group_charter(request, group_type, acronym):
 
     can_manage = can_manage_group_type(request.user, group.type_id)
 
-    return render(request, 'wginfo/group_charter.html',
+    return render(request, 'group/group_charter.html',
                   construct_group_menu_context(request, group, "charter", {
                       "milestones_in_review": group.groupmilestone_set.filter(state="review"),
                       "milestone_reviewer": milestone_reviewer_for_group_type(group_type),
@@ -324,7 +327,7 @@ def history(request, group_type, acronym):
 
     events = group.groupevent_set.all().select_related('by').order_by('-time', '-id')
 
-    return render(request, 'wginfo/history.html',
+    return render(request, 'group/history.html',
                   construct_group_menu_context(request, group, "history", {
                 "events": events,
                 }))
@@ -443,7 +446,7 @@ def make_dot(group):
         node.nodename=nodename(node.name)
         node.styles = get_node_styles(node,group)
 
-    return render_to_string('wginfo/dot.txt',
+    return render_to_string('group/dot.txt',
                              dict( nodes=nodes, edges=edges )
                             )
 

ietf/wginfo/mails.py ietf/group/mails.pyietf/wginfo/mails.py renamed to ietf/group/mails.py

@@ -19,7 +19,7 @@ def email_secretariat(request, group, subject, text):
     text = strip_tags(text)
 
     send_mail(request, to, None, full_subject,
-              "wginfo/email_secretariat.txt",
+              "group/email_secretariat.txt",
               dict(text=text,
                    group=group,
                    group_url=settings.IDTRACKER_BASE_URL + urlreverse('group_charter', kwargs=dict(group_type=group.type_id, acronym=group.acronym)),
@@ -89,7 +89,7 @@ def email_milestone_review_reminder(group, grace_period=7):
 
     send_mail(None, to, None,
               subject,
-              "wginfo/reminder_milestones_need_review.txt",
+              "group/reminder_milestones_need_review.txt",
               dict(group=group,
                    milestones=milestones,
                    reviewer=milestone_reviewer_for_group_type(group.type_id),
@@ -116,7 +116,7 @@ def email_milestones_due(group, early_warning_days):
 
     send_mail(None, to, None,
               subject,
-              "wginfo/reminder_milestones_due.txt",
+              "group/reminder_milestones_due.txt",
               dict(group=group,
                    milestones=milestones,
                    today=today,
@@ -143,7 +143,7 @@ def email_milestones_overdue(group):
 
     send_mail(None, to, None,
               subject,
-              "wginfo/reminder_milestones_overdue.txt",
+              "group/reminder_milestones_overdue.txt",
               dict(group=group,
                    milestones=milestones,
                    url=settings.IDTRACKER_BASE_URL + urlreverse("group_charter", kwargs=dict(group_type=group.type_id, acronym=group.acronym))

ietf/wginfo/milestones.py ietf/group/milestones.pyietf/wginfo/milestones.py renamed to ietf/group/milestones.py

@@ -14,7 +14,7 @@
 from ietf.group.models import Group, GroupMilestone, MilestoneGroupEvent
 from ietf.group.utils import save_milestone_in_history, can_manage_group_type, milestone_reviewer_for_group_type
 from ietf.name.models import GroupMilestoneStateName
-from ietf.wginfo.mails import email_milestones_changed
+from ietf.group.mails import email_milestones_changed
 
 def json_doc_names(docs):
     return json.dumps([{"id": doc.pk, "name": doc.name } for doc in docs])
@@ -317,7 +317,7 @@ def save_milestone_form(f):
 
     forms.sort(key=lambda f: f.milestone.due if f.milestone else datetime.date.max)
 
-    return render(request, 'wginfo/edit_milestones.html',
+    return render(request, 'group/edit_milestones.html',
                   dict(group=group,
                        title=title,
                        forms=forms,
@@ -379,7 +379,7 @@ def reset_charter_milestones(request, group_type, acronym):
 
         return redirect('group_edit_charter_milestones', group_type=group.type_id, acronym=group.acronym)
 
-    return render(request, 'wginfo/reset_charter_milestones.html',
+    return render(request, 'group/reset_charter_milestones.html',
                   dict(group=group,
                        charter_milestones=charter_milestones,
                        current_milestones=current_milestones,