Final version of charter tool in a new branch

 - Legacy-Id: 3341

Author: Martin Qvist

ietf/idrfc/testsREDESIGN.py

@@ -189,7 +189,6 @@ def test_edit_info(self):
                                   status_date=str(date.today() + timedelta(2)),
                                   via_rfc_editor="1",
                                   ad=str(new_ad.pk),
-                                  create_in_state="pub-req",
                                   notify="test@example.com",
                                   note="New note",
                                   telechat_date="",
@@ -214,7 +213,6 @@ def test_edit_telechat_date(self):
         data = dict(intended_std_level=str(draft.intended_std_level_id),
                     status_date=str(date.today() + timedelta(2)),
                     via_rfc_editor="1",
-                    create_in_state="pub-req",
                     ad=str(draft.ad_id),
                     notify="test@example.com",
                     note="",
@@ -275,7 +273,6 @@ def test_start_iesg_process_on_draft(self):
                                   status_date=str(date.today() + timedelta(2)),
                                   via_rfc_editor="1",
                                   ad=ad.pk,
-                                  create_in_state="watching",
                                   notify="test@example.com",
                                   note="This is a note",
                                   telechat_date="",
@@ -284,7 +281,6 @@ def test_start_iesg_process_on_draft(self):
 
         draft = Document.objects.get(name=draft.name)
         self.assertTrue(draft.tags.filter(slug="via-rfc"))
-        self.assertEquals(draft.iesg_state_id, "watching")
         self.assertEquals(draft.ad, ad)
         self.assertEquals(draft.note, "This is a note")
         self.assertTrue(not draft.latest_event(TelechatDocEvent, type="scheduled_for_telechat"))

ietf/idtracker/models.py

@@ -183,9 +183,6 @@ def file_tag(self):
         return "<%s>" % (self.filename_with_rev())
     def filename_with_rev(self):
         return "%s-%s.txt" % (self.filename, self.revision_display())
-    def name(self):
-        # small hack to make model forward-compatible with new schema
-        return self.filename
     def group_acronym(self):
 	return self.group.acronym
     def group_ml_archive(self):
@@ -258,11 +255,11 @@ class PersonOrOrgInfo(models.Model):
     date_created = models.DateField(auto_now_add=True, null=True)
     created_by = models.CharField(blank=True, null=True, max_length=8)
     address_type = models.CharField(blank=True, null=True, max_length=4)
-    def save(self, **kwargs):
+    def save(self):
         self.first_name_key = self.first_name.upper()
         self.middle_initial_key = self.middle_initial.upper()
         self.last_name_key = self.last_name.upper()
-        super(PersonOrOrgInfo, self).save(**kwargs)
+        super(PersonOrOrgInfo, self).save()
     def __str__(self):
         # For django.VERSION 0.96
 	if self.first_name == '' and self.last_name == '':
@@ -276,12 +273,16 @@ def __unicode__(self):
     def email(self, priority=1, type=None):
         name = unicode(self)
         email = ''
-        addresses = self.emailaddress_set.filter(address__contains="@").order_by('priority')
-        if addresses:
-            email = addresses[0].address
-            for a in addresses:
-                if a.priority == priority:
-                    email = a.address
+        types = type and [ type ] or [ "INET", "Prim", None ]
+        for type in types:
+            try:
+                if type:
+                    email = self.emailaddress_set.get(priority=priority, type=type).address
+                else:
+                    email = self.emailaddress_set.get(priority=priority).address
+                break
+            except (EmailAddress.DoesNotExist, AssertionError):
+                pass
 	return (name, email)
     # Added by Sunny Lee to display person's affiliation - 5/26/2007
     def affiliation(self, priority=1):
@@ -409,9 +410,6 @@ def displayname(self):
         return "%s.txt" % ( self.filename() )
     def filename(self):
 	return "rfc%d" % ( self.rfc_number )
-    def name(self):
-        # small hack to make model forward-compatible with new schema
-        return self.filename()
     def revision(self):
 	return "RFC"
     def revision_display(self):
@@ -1139,23 +1137,6 @@ class DocumentWrapper(object):
     def __init__(self, document):
 	self.document = document
 
-if settings.USE_DB_REDESIGN_PROXY_CLASSES:
-    InternetDraftOld = InternetDraft
-    IDInternalOld = IDInternal
-    RfcOld = Rfc
-    BallotInfoOld = BallotInfo
-    IDStateOld = IDState
-    IDSubStateOld = IDSubState
-    AreaOld = Area
-    AcronymOld = Acronym
-    IESGLoginOld = IESGLogin
-    IETFWGOld = IETFWG
-    IRTFOld = IRTF
-    from redesign.doc.proxy import InternetDraft, IDInternal, BallotInfo, Rfc
-    from redesign.name.proxy import IDState, IDSubState
-    from redesign.group.proxy import Area, Acronym, IETFWG, IRTF
-    from redesign.person.proxy import IESGLogin
-
 
 # changes done by convert-096.py:changed maxlength to max_length
 # removed core

ietf/settings.py

@@ -145,6 +145,7 @@
     'ietf.submit',
     'ietf.ietfworkflows',
     'ietf.wgchairs',
+    'ietf.wgrecord',
 )
 
 INTERNAL_IPS = (

ietf/templates/base_leftmenu.html

@@ -40,12 +40,12 @@
   <li><a href="{% url doc_search_by_ad name=user.get_profile.person.full_name_as_key %}">My Documents</a></li>
   <li><a href="{% url ietf.iesg.views.agenda_documents %}">Next Telechat</a></li>
   <li><a href="{% url ietf.iesg.views.discusses %}">Discusses</a></li>
-  <li><a href="{% url iesg_working_group_actions %}">Working Groups</a></li>
+  <li><a href="{% url wg_search_by_ad name=user.get_profile.person.full_name_as_key %}">Working Groups</a></li>
 {% endif %}
 {% if user|in_group:"Secretariat" %}
 <li class="sect first">Secretariat</li>
   <li><a href="{% url ietf.iesg.views.telechat_dates %}">Telechat Dates</a></li>
-  <li><a href="{% url iesg_working_group_actions %}">Working Groups</a></li>
+  <li><a href="{% url wg_search_in_process %}">Working Groups</a></li>
 {% endif %}
 <li class="sect{% if not user|in_group:"Area_Director,Secretariat" %} first{% endif %}">Working Groups</li>
 
@@ -74,6 +74,7 @@
   <li><a href="http://www.ietf.org/meeting/upcoming.html">Upcoming</a></li>
 
 <li class="sect">Other Documents</li>
+  <li><a href="/wgrecord/">WG Records</a></li>
   <li><a href="/ipr/">IPR Disclosures</a></li>
   <li><a href="/liaison/">Liaison&nbsp;Statements</a></li>
   <li><a href="/iesg/agenda/">IESG Agenda</a></li>

ietf/templates/feeds/wg_record_description.html

@@ -0,0 +1,28 @@
+{# Copyright The IETF Trust 2011, All Rights Reserved #}
+{% load ietf_filters %}
+{{ obj.info.text|safe }}<br/>
+<br/>
+{% with obj.group as wg %}
+WG name: {{ wg.name }}<br/>
+WG acronym: {{ wg.acronym }}<br/>
+IETF area: {{ wg.parent|default:"-" }}<br/>
+
+WG chairs: {% for n in obj.chairs %}{{ n }}{% if not forloop.last %}, {% endif %}{% endfor %}<br/>
+WG secretaries: {% for n in obj.secr %}{{ n }}{% if not forloop.last %}, {% endif %}{% endfor %}<br/>
+WG technical advisors: {% for n in obj.techadv %}{{ n }}{% if not forloop.last %}, {% endif %}{% endfor %}<br/>
+Assigned AD: {{ wg.ad }}<br/>
+
+Mailing list: {{ wg.list_email }}<br/>
+Mailing list subscribe {{ wg.list_subscribe }}<br/>
+Mailing list archive: {{ wg.list_archive }}<br/>
+Other web sites: {% for a in wg.groupurl_set.all %}{{ a.url }} {% if a.name %}({{ a.name }}){% endif %}{% if not forloop.last %}, {% endif %}{% endfor %}<br/>
+
+WG State: {{ wg.state|safe }}<br/>
+Charter State: {{ wg.charter.charter_state|safe }}<br/>
+<br/>
+{% if obj.rev %}
+{{ obj.charter|safe }}
+{% else %}
+The WG does not yet have a charter
+{% endif %}
+{% endwith %}

ietf/templates/feeds/wg_record_title.html

@@ -0,0 +1 @@
+{% load ietf_filters %}WG Record for {{obj.group.name}} ({{ obj.group.acronym|safe }})

ietf/templates/idrfc/edit_infoREDESIGN.html

@@ -3,7 +3,7 @@
 {% block title %}Edit info on {{ doc }}{% endblock %}
 
 {% block morecss %}
-form.edit-info #id_notify {
+form.edit-info #id_state_change_notice_to {
   width: 600px;
 }
 form.edit-info #id_note {

ietf/templates/wginfo/wg_base.html

@@ -49,11 +49,13 @@
 .ietf-wg-details tr { vertical-align: top; }
 .ietf-concluded-bg {background-color: #F8F8D0; }
 .ietf-concluded-warning { background:red;color:white;padding:2px 2px;}
+.ietf-proposed-bg { }
+.ietf-proposed-warning { background:green;color:white;padding:2px 2px;}
 {% endblock morecss %}
 
 {% block content %}
-<div {% if concluded %}class="ietf-concluded-bg"{% endif %}>
-<h1>{{wg.group_acronym.name}} ({{wg.group_acronym.acronym}}){% if concluded %}<br/><span class="ietf-concluded-warning">(concluded WG)</span>{% endif %}</h1>
+<div {% if concluded %}class="ietf-concluded-bg"{% endif %} {% if proposed %}class="ietf-proposed-bg"{% endif %}>
+<h1>{{wg.group_acronym.name}} ({{wg.group_acronym.acronym}}){% if concluded %}<br/><span class="ietf-concluded-warning">(concluded WG)</span>{% endif %}{% if proposed %}<br/><span class="ietf-proposed-warning">(proposed WG)</span>{% endif %}</h1>
 
 <div class="ietf-navset">
 {% ifequal selected "documents" %}<span class="selected">Documents</span>{% else %}<a href="/wg/{{wg}}/">Documents</a>{% endifequal %} | 

ietf/templates/wgrecord/add_comment.html

@@ -0,0 +1,36 @@
+{% extends "base.html" %}
+{% comment %}
+Copyright The IETF Trust 2011, All Rights Reserved
+{% endcomment %}
+
+{% block title %}Add comment on {{ wg.acronym }}{% endblock %}
+
+{% block morecss %}
+form.add-comment #id_comment {
+  width: 600px;
+  height: 300px;
+}
+
+form.add-comment .actions {
+  padding-top: 20px;
+}
+{% endblock %}
+
+{% block content %}
+<h1>Add comment on {{ wg.acronym }}</h1>
+
+<p>The comment will be added to the history trail.</p>
+
+<form class="add-comment" action="" method="POST">
+  <table>
+  {{ form.as_table }}
+  <tr>
+    <td></td>
+    <td class="actions">
+      <a href="{% url record_view name=wg.acronym %}">Back</a>
+      <input type="submit" value="Add comment"/>
+    </td>
+  </tr>
+  </table>
+</form>
+{% endblock %}

ietf/templates/wgrecord/announcement_text.html

@@ -0,0 +1,33 @@
+{% extends "base.html" %}
+
+{% block title %}WG {{ announcement }} announcement writeup for {{ doc.group.acronym }}{% endblock %}
+
+{% block morecss %}
+form #id_announcement_text {
+  width: 700px;
+  height: 600px;
+}
+{% endblock %}
+
+{% block content %}
+<h1>WG {{ announcement }} announcement writeup for {{ doc.group.acronym }}</h1>
+
+<form action="" method="POST">
+
+  {{ announcement_text_form.announcement_text }}
+
+  <div class="actions">
+    <a href="{{ back_url }}">Back</a>
+    <input type="submit" value="Save WG {{ announcement }} announcement text" />
+  </div>
+</form>
+
+{% load ietf_filters %}
+{% if user|in_group:"Secretariat" %}
+<p>
+{% if can_announce %}
+<a href="{% url doc_approve_ballot name=doc.name %}">Approve ballot</a>
+{% endif %}
+</p>
+{% endif %}
+{% endblock%}