Fix edit pages and milestones functionality to work with RGs - currently the IRTF Chair takes the same role as the AD

 - Legacy-Id: 7541

Author: OleLaursen

ietf/group/utils.py

@@ -5,6 +5,7 @@
 from ietf.group.models import Group, RoleHistory
 from ietf.person.models import Email
 from ietf.utils.history import get_history_object_for, copy_many_to_many_for_history
+from ietf.ietfauth.utils import has_role
 
 
 def save_group_in_history(group):
@@ -98,3 +99,18 @@ def save_milestone_in_history(milestone):
     copy_many_to_many_for_history(h, milestone)
 
     return h
+
+def can_manage_group_type(user, group_type):
+    if group_type == "rg":
+        return has_role(user, ('IRTF Chair', 'Secretariat'))
+    elif group_type == "wg":
+        return has_role(user, ('Area Director', 'Secretariat'))
+
+    return has_role(user, 'Secretariat')
+
+def milestone_reviewer_for_group_type(group_type):
+    if group_type == "rg":
+        return "IRTF Chair"
+    else:
+        return "Area Director"
+

ietf/templates/base/left_menu.html

@@ -73,7 +73,7 @@
   </div></div></li>
 
   <li style="padding-top:0;"><a href="/wg/">Active WGs</a></li>
-  <li><a href="{% url "ietf.wginfo.views.chartering_wgs" group_type="wg" %}">Chartering WGs</a></li>
+  <li><a href="{% url "ietf.wginfo.views.chartering_groups" group_type="wg" %}">Chartering WGs</a></li>
   <li><a href="{% url "ietf.wginfo.views.bofs" group_type="wg" %}">BoFs</a></li>
   <li><a href="http://tools.ietf.org/wg/concluded">Concluded WGs</a></li>
   <li><a href="http://www.ietf.org/list/nonwg.html">Non-WG Lists</a></li>

ietf/templates/wginfo/chartering_wgs.html …/templates/wginfo/chartering_groups.htmlietf/templates/wginfo/chartering_wgs.html renamed to ietf/templates/wginfo/chartering_groups.html ietf/templates/wginfo/chartering_wgs.html renamed to ietf/templates/wginfo/chartering_groups.html

@@ -1,12 +1,12 @@
 {% extends "base.html" %}
 
-{% block title %}Chartering or Re-Chartering Working Groups{% endblock %}
+{% block title %}Chartering or Re-Chartering Groups{% endblock %}
 
 {% block content %}
 {% load ietf_filters %}
 {% load ballot_icon %}
 
-<h1>Chartering or Re-Chartering Working Groups</h1>
+<h1>Chartering or Re-Chartering Groups</h1>
 
 <p>Groups with a charter in state
 {% for s in charter_states %}{% if not forloop.first %}, {% if forloop.last %}or {% endif %}{% endif %}<i>{{ s.name }}</i>{% endfor %}.</p>

ietf/templates/wginfo/customize_workflow.html

@@ -37,9 +37,10 @@ <h1>Customize Workflow for {{ group.acronym }} {{ group.type.name }}</h1>
 <a href="{% url "group_charter" group_type=group.type_id acronym=group.acronym %}">{{ group.acronym }} {{ group.type.name }}</a>. Note that some states are
 mandatory for group operation and cannot be deactivated.</p>
 
+{% if group.type_id == "wg" %}
 <p>You can see the default Working Group I-D State Diagram
 in <a href="http://tools.ietf.org/html/rfc6174#section-4.1">Section 4.1 of RFC6174</a>.</p>
-
+{% endif %}
 
 <h3>States</h3>
 

ietf/templates/wginfo/edit.html

@@ -43,13 +43,14 @@ <h1>
 so. New accounts can be <a href="{% url "create_account" %}">created here</a>.</p>
 
 <form class="edit" action="" method="post">{% csrf_token %}
+  {% for field in form.hidden_fields %}{{ field }}{% endfor %}
   <table>
     {% for field in form.visible_fields %}
     <tr>
       <th>{{ field.label_tag }} {% if field.field.required %}*{% endif %}</th>
       <td>{{ field }}
-      {% if field.name == "ad" and user|has_role:"Area Director" %}
-      <label><input type="checkbox" name="ad" value="{{ login.pk }}" /> Assign to me</label>
+      {% if field.name == "ad" and request.user|has_role:"Area Director" %}
+      <label><input type="checkbox" name="ad" value="{{ request.user.person.pk }}" /> Assign to me</label>
       {% endif %}
       {% if field.help_text %}<div class="help">{{ field.help_text }}</div>{% endif %}
       {{ field.errors }}

ietf/templates/wginfo/edit_milestones.html

@@ -51,8 +51,7 @@ <h1>{{ title }}</h1>
 
 {% if needs_review %}
 Note that as {{ group.type.name }} Chair you cannot edit descriptions of existing
-milestones and milestones you add are subject to review by the Area
-Director.
+milestones and milestones you add are subject to review by the {{ reviewer }}.
 {% endif %}
 </p>
 
@@ -86,7 +85,7 @@ <h1>{{ title }}</h1>
 
 <tr class="edit-milestone{% if form.changed %} changed{% endif %}"><td colspan="2">{% include "wginfo/milestone_form.html" %}</td></tr>
 {% endfor %}
-<tr class="milestone add"><td></td><td>Add {% if milestone_set == "chartering" %}charter{% endif%} milestone {% if needs_review %}for AD review{% endif %}</td></tr>
+<tr class="milestone add"><td></td><td>Add {% if milestone_set == "chartering" %}charter{% endif%} milestone {% if needs_review %}for {{ reviewer }} review{% endif %}</td></tr>
 <tr class="edit-milestone template"><td colspan="2">{% include "wginfo/milestone_form.html" with form=empty_form %}</td></tr>
 </table>
 

ietf/templates/wginfo/group_base.html

@@ -74,7 +74,7 @@ <h1>{{ group.name}} ({{ group.acronym }})
   | <a href="{{ group.list_archive }}">List Archive &raquo;</a>
   {% endif %}
   {% if group.has_tools_page %}
-  | <a href="http://tools.ietf.org/wg/{{ group.acronym }}/">Tools WG Page &raquo;</a>
+  | <a href="http://tools.ietf.org/{{ group.type_id }}/{{ group.acronym }}/">Tools {{ group.type.name }} Page &raquo;</a>
   {% endif %}
   </div>
 

ietf/templates/wginfo/group_charter.html

@@ -12,7 +12,7 @@
 <div class="ietf-box ietf-group-details">
 
 {% if group.state_id == "conclude" %}
-<span class="ietf-concluded-warning">Note: The data for concluded WGs
+<span class="ietf-concluded-warning">Note: The data for concluded {{ group.type.name }}s
 is occasionally incorrect.</span>
 {% endif %}
 
@@ -162,7 +162,7 @@ <h2>{% if group.state_id == "proposed" %}Proposed{% endif %} Milestones</h2>
 
 {% if milestones_in_review %}
 <p>+ {{ milestones_in_review|length }} new milestone{{ milestones_in_review|pluralize }}
-currently in Area Director review.</p>
+currently in {{ milestone_reviewer }} review.</p>
 {% endif %}
 
 {% endblock %}

ietf/templates/wginfo/milestone_form.html

@@ -1,4 +1,4 @@
-{# assumes group, form, needs_review are in the context #}
+{# assumes group, form, needs_review, reviewer are in the context #}
 <input type="hidden" name="prefix" value="{{ form.prefix|default:"" }}"/>
 {{ form.id }}
 
@@ -35,7 +35,7 @@
     <td>Review:</td>
     <td class="accept">
       This milestone is not active yet, awaiting
-      AD acceptance{% if needs_review %}.{% else %}: {{ form.accept }}{% endif %}
+      {{ reviewer }} acceptance{% if needs_review %}.{% else %}: {{ form.accept }}{% endif %}
     </td>
   </tr>
   {% endif %}

ietf/templates/wginfo/reminder_milestones_need_review.txt

@@ -1,4 +1,4 @@
-{% autoescape off %}{% filter wordwrap:73 %}{{ milestones|length }} new milestone{{ milestones|pluralize }} in "{{ group.name }}" {% if milestones|length > 1 %}need{% else %}needs{%endif %} an AD review:
+{% autoescape off %}{% filter wordwrap:73 %}{{ milestones|length }} new milestone{{ milestones|pluralize }} in "{{ group.name }}" {% if milestones|length > 1 %}need{% else %}needs{%endif %} review by the {{ reviewer }}:
 
 {% for m in milestones %}"{{ m.desc }}"{% if m.days_ready != None %}
 Waiting for {{ m.days_ready }} day{{ m.days_ready|pluralize }}.{% endif %}