Merged in charter branch fixes from olau@iola.dk, from r4354 through r4381.

levkowetz · levkowetz · commit 839df6048046 · 2012-05-04T11:47:30.000Z
- Legacy-Id: 4382
diff --git a/ietf/doc/utils.py b/ietf/doc/utils.py
@@ -136,7 +136,7 @@ def augment_with_start_time(docs):
 def get_chartering_type(doc):
     chartering = ""
     if doc.get_state_slug() not in ("notrev", "approved"):
-        if doc.group.state_id == "proposed":
+        if doc.group.state_id in ("proposed", "bof"):
             chartering = "initial"
         elif doc.group.state_id == "active":
             chartering = "rechartering"
diff --git a/ietf/idrfc/urls.py b/ietf/idrfc/urls.py
@@ -32,6 +32,7 @@
 
 from django.conf.urls.defaults import patterns, url, include
 from ietf.idrfc import views_doc, views_search, views_edit, views_ballot, views
+from ietf.doc.models import State
 
 urlpatterns = patterns('',
     (r'^/?$', views_search.search_main),
@@ -69,3 +70,9 @@
 
     (r'^(?P<name>[A-Za-z0-9.-]+)/charter/', include('ietf.wgcharter.urls')),
 )
+
+urlpatterns += patterns('django.views.generic.simple',
+    url(r'^help/state/charter/$', 'direct_to_template', { 'template': 'wgcharter/states.html', 'extra_context': { 'states': State.objects.filter(type="charter") } }, name='help_charter_states'),
+)
+
+
diff --git a/ietf/idrfc/views_ballot.py b/ietf/idrfc/views_ballot.py
@@ -475,9 +475,11 @@ def send_ballot_commentREDESIGN(request, name, ballot_id):
 
     subj = []
     d = ""
+    blocking_name = "DISCUSS"
     if pos.pos.blocking and pos.discuss:
         d = pos.discuss
-        subj.append(pos.pos.name.upper())
+        blocking_name = pos.pos.name.upper()
+        subj.append(blocking_name)
     c = ""
     if pos.comment:
         c = pos.comment
@@ -488,10 +490,13 @@ def send_ballot_commentREDESIGN(request, name, ballot_id):
     if subj:
         subject += ": (with %s)" % " and ".join(subj)
 
-    doc.filename = doc.name # compatibility attributes
-    doc.revision_display = doc.rev
     body = render_to_string("idrfc/ballot_comment_mail.txt",
-                            dict(discuss=d, comment=c, ad=ad.plain_name(), doc=doc, pos=pos.pos))
+                            dict(discuss=d,
+                                 comment=c,
+                                 ad=ad.plain_name(),
+                                 doc=doc,
+                                 pos=pos.pos,
+                                 blocking_name=blocking_name,))
     frm = ad.role_email("ad").formatted_email()
     to = "The IESG <iesg@ietf.org>"
         
diff --git a/ietf/templates/idrfc/ballot_comment_mail.txt b/ietf/templates/idrfc/ballot_comment_mail.txt
@@ -1,19 +1,21 @@
 {% autoescape off %}{{ ad }} has entered the following ballot position for
-{{ doc.filename }}-{{ doc.revision_display }}: {{ pos.name }}
+{{ doc.name }}-{{ doc.rev }}: {{ pos.name }}
 
 When responding, please keep the subject line intact and reply to all
 email addresses included in the To and CC lines. (Feel free to cut this
 introductory paragraph, however.)
 
+{% if doc.type_id == "draft" %}
 Please refer to http://www.ietf.org/iesg/statement/discuss-criteria.html
 for more information about IESG DISCUSS and COMMENT positions.
+{% endif %}
 
 {% if not discuss and not comment %}
-There is no DISCUSS or COMMENT text associated with this position.
+There are no remarks associated with this position.
 {% endif %}
 
 {% if discuss %}----------------------------------------------------------------------
-DISCUSS:
+{{ blocking_name }}:
 ----------------------------------------------------------------------
 
 {{ discuss|safe|wordwrap:73 }}
diff --git a/ietf/templates/idrfc/document_charter.html b/ietf/templates/idrfc/document_charter.html
@@ -34,7 +34,7 @@
       <td>{{ group.state.name }}</td>
     </tr>
     <tr>
-      <td><a href="/wgcharter/help/state/">Charter State</a>:</td>
+      <td><a href="/doc/help/state/charter/">Charter State</a>:</td>
       <td>
         <div>
         <a title="{{ doc.get_state.desc }}"{% if not snapshot and user|has_role:"Area Director,Secretariat" %} href="{% url charter_change_state name=doc.name %}"{% endif %}>{{ doc.get_state.name }}</a>
@@ -52,7 +52,11 @@
         {% endif %}
 
         {% else %}
-        - <a href="{% url charter_startstop_process name=doc.name option='recharter' %}">Recharter</a>
+          {% if group.state_id == "proposed" or group.state_id == "bof" %}
+          - <a href="{% url charter_startstop_process name=doc.name option='initcharter' %}">Charter</a>
+          {% else %}
+          - <a href="{% url charter_startstop_process name=doc.name option='recharter' %}">Recharter</a>
+          {% endif %}
         {% endif %}
 
         {% endif %}
@@ -101,7 +105,7 @@
 
 <h3>Charter {{ doc.canonical_name }}-{{ doc.rev }}
 
-{% if user|has_role:"Area Director,Secretariat" and chartering and group.state_id != "conclude" %}
+{% if not snapshot and user|has_role:"Area Director,Secretariat" and chartering and group.state_id != "conclude" %}
 <a class="edit" href="{% url charter_submit name=doc.name %}">Change charter text</a>
 {% endif %}
 </h3>
diff --git a/ietf/templates/idrfc/document_history.html b/ietf/templates/idrfc/document_history.html
@@ -11,7 +11,7 @@
 {% block content %}
 {{ top|safe }}
 
-{% if diff_revisions %}
+{% if diff_revisions and diff_revisions|length > 1 %}
 <div class="ietf-box diffTool">
   <h2>Diffs</h2>
 
diff --git a/ietf/templates/idrfc/document_writeup.html b/ietf/templates/idrfc/document_writeup.html
@@ -13,7 +13,7 @@
 <div class="writeup">
 <h2>{{ title }}</h2>
 
-{% if can_edit %}<a href="{{ url }}" class="edit">Edit {{ title }}</a>{% endif %}
+{% if can_edit %}<a href="{{ url }}" class="edit">{% if text %}Edit{% else %}Generate{% endif %} {{ title }}</a>{% endif %}
 
 <pre {% if can_edit %}class="editable"{% endif %}>
 {{ text }}
diff --git a/ietf/templates/wgcharter/action_text.txt b/ietf/templates/wgcharter/action_text.txt
@@ -2,7 +2,7 @@
 To: IETF-Announce <ietf-announce@ietf.org>
 Subject: WG Action: {{ action_type }} {{ wg.name }} ({{ wg.acronym }})
 
-{% filter wordwrap:73 %}{% ifequal action_type "Formed" %}A new IETF working group has been formed in the {{ wg.parent.name }}.{% endifequal %}{% ifequal action_type "Rechartered" %}The {{ wg.name }} ({{ wg.acronym }}) working group in the {{ wg.parent.name }} of the IETF has been rechartered.{% endifequal %} For additional information please contact the Area Directors or the WG Chair.
+{% filter wordwrap:73 %}{% ifequal action_type "Formed" %}A new IETF working group has been formed in the {{ wg.parent.name }}.{% endifequal %}{% ifequal action_type "Rechartered" %}The {{ wg.name }} ({{ wg.acronym }}) working group in the {{ wg.parent.name }} of the IETF has been rechartered.{% endifequal %} For additional information please contact the Area Directors or the WG Chair{{ chairs|pluralize}}.
 
 {% include "wgcharter/wg_info.txt" %}
 
diff --git a/ietf/templates/wgcharter/ballot_writeupnotes.html b/ietf/templates/wgcharter/ballot_writeupnotes.html
@@ -22,7 +22,7 @@ <h1>Ballot writeup and notes for {{ charter.chartered_group }}</h1>
   <div class="actions">
     <a href="{% url doc_writeup name=charter.name %}">Back</a>
     <input type="submit" name="save_ballot_writeup" value="Save Ballot Writeup" />
-    <input style="margin-left: 8px" type="submit" name="issue_ballot" value="Save and {% if reissue %}Re-{% endif %}Issue Ballot" />
+    <input style="margin-left: 8px" type="submit" name="send_ballot" value="Save and {% if reissue %}Re-{% endif %}Send Ballot to the IESG" />
   </div>
 </form>
 
diff --git a/ietf/templates/wgcharter/change_state.html b/ietf/templates/wgcharter/change_state.html
@@ -48,7 +48,7 @@ <h1>{{ title }}</h1>
       {{ field.errors }}
       </td>
     </tr>
-    {% if field.name == "charter_state" and not option == "initcharter" %}
+    {% if field.name == "charter_state" and chartering_type == "rechartering" %}
     <tr class="ballot-wo-extern" style="display:none">
       <td></td>
       <td><label><input name="ballot_wo_extern" type="checkbox" /> Ask whether external review can be skipped in ballot</label></td>
@@ -64,7 +64,7 @@ <h1>{{ title }}</h1>
         <input type="submit" value="Submit"/>
         {% else %}
         <a href="{% url doc_view name=doc.name %}">Back</a>
-        <input type="submit" value="Save"/>
+        <input type="submit" value="Save and (possibly) notify Secretariat"/>
         {% endif %}
       </td>
     </tr>
diff --git a/ietf/templates/wgcharter/wg_info.txt b/ietf/templates/wgcharter/wg_info.txt
@@ -2,23 +2,23 @@
 ------------------------------------------------
 Current Status: {{ wg.state.name }} Working Group
 
-Chairs:
+{% if chairs %}Chairs:
 {% for r in chairs %}  {{ r.person.plain_name }} <{{r.email.address}}>
 {% endfor %}
-Secretaries:
+{% endif %}{% if secr %}Secretaries:
 {% for r in secr %}  {{ r.person.plain_name }} <{{r.email.address}}>
 {% endfor %}
-Technical advisors:
+{% endif %}{% if techadv %}Technical advisors:
 {% for r in techadv %}  {{ r.person.plain_name }} <{{r.email.address}}>
 {% endfor %}
-Assigned Area Director:
-{% if wg.ad %}  {{ wg.ad.plain_name }} <{{ ad_email }}>{% endif %}
+{% endif %}{% if wg.ad %}Assigned Area Director:
+  {{ wg.ad.plain_name }} <{{ ad_email }}>
 
-Mailing list:
+{% endif %}{% if wg.list_email %}Mailing list
   Address: {{ wg.list_email }}
   To Subscribe: {{ wg.list_subscribe }}
   Archive: {{ wg.list_archive }}
-  
-Charter:
+{% endif %}
+Charter of Working Group:
 
 {{ charter_text }}
diff --git a/ietf/templates/wginfo/edit.html b/ietf/templates/wginfo/edit.html
@@ -52,7 +52,7 @@ <h1>{% if wg %}
   <table>
     {% for field in form.visible_fields %}
     <tr>
-      <th>{{ field.label_tag }}:</th>
+      <th>{{ field.label_tag }}: {% if field.field.required %}*{% endif %}</th>
       <td>{{ field }}
       {% ifequal field.name "ad" %}
       {% if user|has_role:"Area Director" %}
diff --git a/ietf/utils/textupload.py b/ietf/utils/textupload.py
@@ -0,0 +1,43 @@
+import re
+
+import django.forms
+
+def get_cleaned_text_file_content(uploaded_file):
+    """Read uploaded file, try to fix up encoding to UTF-8 and
+    transform line endings into Unix style, then return the content as
+    a UTF-8 string. Errors are reported as
+    django.forms.ValidationError exceptions."""
+
+    if not uploaded_file:
+        return u""
+
+    if uploaded_file.size and uploaded_file.size > 10 * 1000 * 1000:
+        raise django.forms.ValidationError("Text file too large (size %s)." % uploaded_file.size)
+
+    content = "".join(uploaded_file.chunks())
+
+    # try to fixup encoding
+    import magic
+    m = magic.open(magic.MAGIC_MIME)
+    m.load()
+
+    filetype = m.buffer(content) # should look like "text/plain; charset=us-ascii"
+
+    if not filetype.startswith("text"):
+        raise django.forms.ValidationError("Uploaded file does not appear to be a text file.")
+
+    match = re.search("charset=([\w-]+)", filetype)
+    if not match:
+        raise django.forms.ValidationError("File has unknown encoding.")
+
+    encoding = match.group(1)
+    if "ascii" not in encoding:
+        try:
+            content = content.decode(encoding)
+        except Exception as e:
+            raise django.forms.ValidationError("Error decoding file (%s). Try submitting with UTF-8 encoding or remove non-ASCII characters." % str(e))
+
+    # turn line-endings into Unix style
+    content = content.replace("\r\n", "\n").replace("\r", "\n")
+
+    return content.encode("utf-8")
diff --git a/ietf/wgcharter/mails.py b/ietf/wgcharter/mails.py
@@ -48,7 +48,12 @@ def generate_ballot_writeup(request, doc):
     
     return e
 
-def default_action_text(wg, charter, user, action):
+def default_action_text(wg, charter, user):
+    if next_approved_revision(wg.charter.rev) == "01":
+        action = "Formed"
+    else:
+        action = "Rechartered"
+
     e = WriteupDocEvent(doc=charter, by=user)
     e.by = user
     e.type = "changed_action_announcement"
diff --git a/ietf/wgcharter/tests.py b/ietf/wgcharter/tests.py
@@ -67,18 +67,19 @@ def test_change_state(self):
         
             charter = Document.objects.get(name="charter-ietf-%s" % group.acronym)
             self.assertEquals(charter.get_state_slug(), slug)
-            self.assertTrue(charter.docevent_set.count() > events_before)
+            events_now = charter.docevent_set.count()
+            self.assertTrue(events_now > events_before)
+
+            def find_event(t):
+                return [e for e in charter.docevent_set.all()[:events_now - events_before] if e.type == t]
+
+            self.assertTrue("State changed" in find_event("changed_document")[0].desc)
+
             if slug in ("intrev", "iesgrev"):
-                self.assertEquals(charter.docevent_set.all()[0].type, "created_ballot")
-                self.assertTrue("State changed" in charter.docevent_set.all()[1].desc)
-            else:
-                self.assertTrue("State changed" in charter.docevent_set.all()[0].desc)
-            if slug == "extrev":
-                self.assertEquals(len(outbox), mailbox_before + 1)
-                self.assertTrue("State changed" in outbox[-1]['Subject'])
-            else:
-                self.assertEquals(len(outbox), mailbox_before + 1)
-                self.assertTrue("State changed" in outbox[-1]['Subject'])
+                self.assertTrue(find_event("created_ballot"))
+
+            self.assertEquals(len(outbox), mailbox_before + 1)
+            self.assertTrue("State changed" in outbox[-1]['Subject'])
                     
     def test_edit_telechat_date(self):
         make_test_data()
@@ -130,9 +131,20 @@ def test_submit_charter(self):
         q = PyQuery(r.content)
         self.assertEquals(len(q('form input[name=txt]')), 1)
 
+        # faulty post
+        test_file = StringIO("\x10\x11\x12") # post binary file
+        test_file.name = "unnamed"
+
+        r = self.client.post(url, dict(txt=test_file))
+        self.assertEquals(r.status_code, 200)
+        self.assertTrue("does not appear to be a text file" in r.content)
+
+        # post
         prev_rev = charter.rev
 
-        test_file = StringIO("hello world")
+        latin_1_snippet = '\xe5' * 10
+        utf_8_snippet = '\xc3\xa5' * 10
+        test_file = StringIO("Windows line\r\nMac line\rUnix line\n" + latin_1_snippet)
         test_file.name = "unnamed"
 
         r = self.client.post(url, dict(txt=test_file))
@@ -142,6 +154,10 @@ def test_submit_charter(self):
         self.assertEquals(charter.rev, next_revision(prev_rev))
         self.assertTrue("new_revision" in charter.latest_event().type)
 
+        with open(os.path.join(self.charter_dir, charter.canonical_name() + "-" + charter.rev + ".txt")) as f:
+            self.assertEquals(f.read(),
+                              "Windows line\nMac line\nUnix line\n" + utf_8_snippet)
+
 class CharterApproveBallotTestCase(django.test.TestCase):
     fixtures = ['names']
 
diff --git a/ietf/wgcharter/urls.py b/ietf/wgcharter/urls.py
@@ -1,12 +1,8 @@
 # Copyright The IETF Trust 2011, All Rights Reserved
 
 from django.conf.urls.defaults import patterns, url
-from ietf.doc.models import State
 
-urlpatterns = patterns('django.views.generic.simple',
-    url(r'^help/state/$', 'direct_to_template', { 'template': 'wgcharter/states.html', 'extra_context': { 'states': State.objects.filter(type="charter") } }, name='help_charter_states'),
-)
-urlpatterns += patterns('',
+urlpatterns = patterns('',
     url(r'^state/$', "ietf.wgcharter.views.change_state", name='charter_change_state'),
     url(r'^(?P<option>initcharter|recharter|abandon)/$', "ietf.wgcharter.views.change_state", name='charter_startstop_process'),
     url(r'^telechat/$', "ietf.wgcharter.views.telechat_date", name='charter_telechat_date'),
diff --git a/ietf/wgcharter/views.py b/ietf/wgcharter/views.py
diff --git a/ietf/wginfo/edit.py b/ietf/wginfo/edit.py
