Merged in fixes from Ole, from branch/charter:r4382-4407, and some changes from Henrik (removing the use of pos.blocked in views_ballot.py, and setting a ballot id in idrfc/testsREDESIGN.py) to make idrfc.EditPositionTestCase succeed.

 - Legacy-Id: 4444

Author: levkowetz

ietf/group/models.py

@@ -86,6 +86,7 @@ def __unicode__(self):
     ("changed_state", "Changed state"),
     ("added_comment", "Added comment"),
     ("info_changed", "Changed metadata"),
+    ("requested_close", "Requested closing group"),
     ]
 
 class GroupEvent(models.Model):

ietf/idrfc/idrfc_wrapper.py

@@ -33,6 +33,7 @@
 from ietf.idtracker.models import InternetDraft, IDInternal, BallotInfo, IESGDiscuss, IESGLogin, DocumentComment, Acronym, IDState
 from ietf.idrfc.models import RfcEditorQueue
 from ietf.ipr.models import IprRfc, IprDraft, IprDetail
+from ietf.doc.models import BallotDocEvent
 
 import re
 from datetime import date

ietf/idrfc/testsREDESIGN.py

@@ -40,6 +40,7 @@
 from django.conf import settings
 
 from pyquery import PyQuery
+import debug
 
 from ietf.doc.models import *
 from ietf.name.models import *
@@ -505,7 +506,8 @@ def test_edit_position_as_secretary(self):
 
     def test_cannot_edit_position_as_pre_ad(self):
         draft = make_test_data()
-        url = urlreverse('doc_edit_position', kwargs=dict(name=draft.name))
+        url = urlreverse('doc_edit_position', kwargs=dict(name=draft.name,
+                                                     ballot_id=draft.latest_event(BallotDocEvent, type="created_ballot").pk))
 
         # transform to pre-ad
         ad_role = Role.objects.filter(name="ad")[0]

ietf/idrfc/views_ballot.py

@@ -13,6 +13,8 @@
 from django.utils import simplejson
 from django.conf import settings
 
+import debug
+
 from ietf.utils.mail import send_mail_text, send_mail_preformatted
 from ietf.ietfauth.decorators import group_required, role_required
 from ietf.idtracker.templatetags.ietf_filters import in_group
@@ -274,8 +276,10 @@ def edit_positionREDESIGN(request, name, ballot_id):
             pos.comment = clean["comment"].rstrip()
             pos.comment_time = old_pos.comment_time if old_pos else None
             pos.discuss = clean["discuss"].rstrip()
-            if not pos.pos.blocking:
+            if not pos.pos_id == "discuss":
                 pos.discuss = ""
+#            if not pos.pos.blocking:
+#                pos.discuss = ""
             pos.discuss_time = old_pos.discuss_time if old_pos else None
 
             changes = []
@@ -350,7 +354,6 @@ def edit_positionREDESIGN(request, name, ballot_id):
         form = EditPositionForm(initial=initial, ballot_type=ballot.ballot_type)
 
     blocking_positions = dict((p.pk, p.name) for p in form.fields["position"].queryset.all() if p.blocking)
-    print blocking_positions, form.fields["position"].queryset.all()
 
     ballot_deferred = None
     if doc.get_state_slug("%s-iesg" % doc.type_id) == "defer":
@@ -363,7 +366,7 @@ def edit_positionREDESIGN(request, name, ballot_id):
                                    return_to_url=return_to_url,
                                    old_pos=old_pos,
                                    ballot_deferred=ballot_deferred,
-                                   show_discuss_text=old_pos and old_pos.pos.blocking,
+                                   show_discuss_text=old_pos and old_pos.pos_id=="discuss",
                                    blocking_positions=simplejson.dumps(blocking_positions),
                                    ),
                               context_instance=RequestContext(request))
@@ -476,7 +479,7 @@ def send_ballot_commentREDESIGN(request, name, ballot_id):
     subj = []
     d = ""
     blocking_name = "DISCUSS"
-    if pos.pos.blocking and pos.discuss:
+    if pos.pos_id == "discuss" and pos.discuss:
         d = pos.discuss
         blocking_name = pos.pos.name.upper()
         subj.append(blocking_name)

ietf/idrfc/views_search.py

@@ -68,11 +68,14 @@ def clean_name(self):
     def clean(self):
         q = self.cleaned_data
         # Reset query['by'] if needed
-        for k in ('author','group','area','ad'):
-            if (q['by'] == k) and not q[k]:
+        if 'by' not in q:
+            q['by'] = None            
+        else:
+            for k in ('author','group','area','ad'):
+                if (q['by'] == k) and not q[k]:
+                    q['by'] = None
+            if (q['by'] == 'state') and not (q['state'] or q['subState']):
                 q['by'] = None
-        if (q['by'] == 'state') and not (q['state'] or q['subState']):
-            q['by'] = None
         # Reset other fields
         for k in ('author','group','area','ad'):
             if q['by'] != k:
@@ -296,11 +299,14 @@ def clean_name(self):
         def clean(self):
             q = self.cleaned_data
             # Reset query['by'] if needed
-            for k in ('author','group','area','ad'):
-                if (q['by'] == k) and (k not in q or not q[k]):
+            if 'by' not in q:
+                q['by'] = None            
+            else:
+                for k in ('author','group','area','ad'):
+                    if (q['by'] == k) and (k not in q or not q[k]):
+                        q['by'] = None
+                if (q['by'] == 'state') and (not 'state' in q or not 'subState' in q or not (q['state'] or q['subState'])):
                     q['by'] = None
-            if (q['by'] == 'state') and (not 'state' in q or not 'subState' in q or not (q['state'] or q['subState'])):
-                q['by'] = None
             # Reset other fields
             for k in ('author','group','area','ad'):
                 if q['by'] != k:

ietf/submit/tests.py

@@ -16,7 +16,7 @@
 
 from ietf.person.models import Person, Email
 from ietf.group.models import Group, Role
-from ietf.doc.models import Document, BallotPositionDocEvent
+from ietf.doc.models import Document, BallotDocEvent, BallotPositionDocEvent
 from ietf.submit.models import IdSubmissionDetail
 
 class SubmitTestCase(django.test.TestCase):
@@ -163,6 +163,7 @@ def test_submit_existing(self):
 
         # make a discuss to see if the AD gets an email
         ballot_position = BallotPositionDocEvent()
+        ballot_position.ballot = draft.latest_event(BallotDocEvent, type="created_ballot")
         ballot_position.pos_id = "discuss"
         ballot_position.type = "changed_ballot_position"
         ballot_position.doc = draft
@@ -234,7 +235,7 @@ def test_submit_existing(self):
         self.assertTrue(name in unicode(outbox[-2]))
         self.assertTrue("mars" in unicode(outbox[-2]))
         self.assertTrue(draft.ad.role_email("ad").address in unicode(outbox[-2]))
-        self.assertTrue(ballot_position.ad.email_address() in unicode(outbox[-2]))
+        self.assertTrue(ballot_position.ad.role_email("ad").address in unicode(outbox[-2]))
         self.assertTrue("New Version Notification" in outbox[-1]["Subject"])
         self.assertTrue(name in unicode(outbox[-1]))
         self.assertTrue("mars" in unicode(outbox[-1]))

ietf/templates/idrfc/document_charter.html

@@ -53,9 +53,9 @@
 
         {% else %}
           {% if group.state_id == "proposed" or group.state_id == "bof" %}
-          - <a href="{% url charter_startstop_process name=doc.name option='initcharter' %}">Charter</a>
+          - <a href="{% url charter_submit name=doc.name option='initcharter' %}">Start chartering</a>
           {% else %}
-          - <a href="{% url charter_startstop_process name=doc.name option='recharter' %}">Recharter</a>
+          - <a href="{% url charter_submit name=doc.name option='recharter' %}">Recharter</a>
           {% endif %}
         {% endif %}
 
@@ -88,16 +88,24 @@
     </tr>
     {% endif %}
 
-
     <tr><td colspan='2'><hr size='1' noshade /></td></tr>
 
+    <tr>
+      <td>Send notices to:</td>
+      <td>{{ doc.notify|default:"none" }}
+          {% if user|has_role:"Area Director,Secretariat" %}
+          - <a href="{% url charter_edit_notify name=doc.name %}">Change</a>
+          {% endif %}
+      </td>
+    </tr>
+
     <tr><td>Last updated:</td><td> {{ doc.time|date:"Y-m-d" }}</td></tr>
 
     <tr><td colspan='2'><hr size='1' noshade /></td></tr>
   </table>
 
   <div class="actions">
-    <a href="/feed/wgchanges/{{ group.acronym }}/">Atom feed</a>
+    <a href="/feed/group-changes/{{ group.acronym }}/">Atom feed</a>
   </div>
 </div>
 

ietf/templates/wgcharter/change_state.html

@@ -20,7 +20,9 @@
 {% block content %}
 <h1>{{ title }}</h1>
 
-{% if "Change state" in title %}<p class="helptext">For help on the states, see the <a href="{% url help_charter_states %}">state table</a>.</p>{% endif %}
+{% if not option %}
+<p class="helptext">For help on the states, see the <a href="{% url help_charter_states %}">state table</a>.</p>
+{% endif %}
 
 <form class="change-state" action="" method="post">
   <table>
@@ -60,9 +62,10 @@ <h1>{{ title }}</h1>
     {% endif %}
     <tr>
       <td colspan="2" class="actions">
-        {% if option %}
-        <input type="submit" value="Submit"/>
-        {% else %}
+        {% if option == "initcharter" or option == "recharter" %}
+        <input type="submit" value="Initiate chartering"/>
+        {% endif %}
+        {% if not option or option == "abandon" %}
         <a href="{% url doc_view name=doc.name %}">Back</a>
         <input type="submit" value="Save and (possibly) notify Secretariat"/>
         {% endif %}

ietf/templates/wgcharter/edit_notify.html

@@ -0,0 +1,32 @@
+{% extends "base.html" %}
+
+{% block title %}Set notification list for {{ doc.name }}{% endblock %}
+
+{% block morecss %}
+form.edit-notify td input#id_notify { width: 40em; }
+form.edit-notify td.actions { padding-top: 1em; }
+{% endblock %}
+
+{% block content %}
+{% load ietf_filters %}
+<h1>Set notification list for {{ doc.name }}</h1>
+
+<form class="edit-notify" action="" method="POST">
+  <table>
+    <tr>
+      <th>{{ form.notify.label_tag }}:</th>
+      <td>{{ form.notify }}
+      <div class="help">{{ form.notify.help_text }}</div>
+      {{ form.notify.errors }}
+      </td>
+    </tr>
+    <tr>
+      <td></td>
+      <td class="actions">
+        <a href="{% url doc_view name=doc.name %}">Back</a>
+        <input type="submit" value="Save"/>
+      </td>
+    </tr>
+  </table>
+</form>
+{% endblock %}

ietf/templates/wginfo/edit.html

@@ -4,35 +4,20 @@
 {% if wg %}
 Edit WG {{ wg.acronym }}
 {% else %}
-Create WG
+Start chartering new WG
 {% endif %}
 {% endblock %}
 
 {% block morecss %}
-form.edit-info #id_name {
-  width: 396px;
-}
-
-form.edit-info #id_list_email {
-  width: 396px;
-}
-
-form.edit-info #id_list_subscribe {
-  width: 396px;
-}
-
-form.edit-info #id_list_archive {
-  width: 396px;
-}
-
-form.edit-info #id_urls {
-  width: 400px;
-}
-
-form.edit-info #id_comments {
-  width: 400px;
-}
-
+form.edit #id_name,
+form.edit #id_list_email,
+form.edit #id_list_subscribe,
+form.edit #id_list_archive,
+form.edit #id_urls,
+form.edit #id_comments { width: 400px; }
+form.edit input[type=checkbox] { vertical-align: middle; }
+ul.errorlist { border-width: 0px; padding: 0px; margin: 0px;}
+ul.errorlist li { color: #a00; margin: 0px; padding: 0px; list-style: none; }
 {% endblock %}
 
 {% block pagehead %}
@@ -44,11 +29,11 @@
 <h1>{% if wg %}
 Edit WG {{ wg.acronym }}
 {% else %}
-Create WG
+Start chartering new WG
 {% endif %}
 </h1>
 
-<form class="edit-info" action="" method="POST">
+<form class="edit" action="" method="POST">
   <table>
     {% for field in form.visible_fields %}
     <tr>
@@ -63,6 +48,14 @@ <h1>{% if wg %}
       {{ field.errors }}
       </td>
     </tr>
+    {% if field.name == "acronym" and form.confirm_msg %}
+    <tr>
+      <td></td>
+      <td><input name="confirmed" type="checkbox"{% if form.autoenable_confirm %} checked="checked"{% endif %}/>
+      {{ form.confirm_msg }}
+      </td>
+    </tr>
+    {% endif %}
     {% endfor %}
     <tr>
       <td></td>
@@ -71,7 +64,7 @@ <h1>{% if wg %}
           <a href="{% url wg_charter acronym=wg.acronym %}">Back</a>
           <input type="submit" value="Save"/>
         {% else %}
-          <input type="submit" value="Create"/>
+          <input type="submit" value="Start chartering"/>
 	{% endif %}
       </td>
     </tr>
@@ -83,4 +76,15 @@ <h1>{% if wg %}
 <script type="text/javascript" src="/js/lib/jquery.tokeninput.js"></script>
 <script type="text/javascript" src="/js/lib/json2.js"></script>
 <script type="text/javascript" src="/js/emails-field.js"></script>
+<script>
+jQuery(function () {
+    if (jQuery('input[name="confirmed"]').length > 0) {
+        jQuery('input[name="acronym"]').change(function() {
+            // make sure we don't accidentally confirm another acronym
+            jQuery('input[name="confirmed"]').closest("tr").remove();
+            jQuery('input[name="acronym"]').siblings(".errorlist").remove();
+        });
+    }
+});
+</script>
 {% endblock %}