Merge charter branch with the UI hooks disabled for the time being

 - Legacy-Id: 3800

Author: OleLaursen

ietf/idtracker/templatetags/ietf_filters.py

@@ -431,6 +431,15 @@ def stable_dictsort(value, arg):
     decorated.sort(lambda a, b: cmp(a[0], b[0]) if a[0] and b[0] else -1 if b[0] else 1 if a[0] else 0)
     return [item[1] for item in decorated]
 
+@register.filter
+def ad_area(user):
+    if user and user.is_authenticated():
+        from redesign.group.models import Group
+        g = Group.objects.filter(role__name="ad", role__person__user=user)
+        if g:
+            return g[0].acronym
+    return None
+
 def _test():
     import doctest
     doctest.testmod()

ietf/ietfworkflows/forms.py

@@ -22,6 +22,7 @@
 from redesign.doc.models import save_document_in_history, DocEvent, Document
 from redesign.name.models import DocTagName, StreamName, RoleName
 from redesign.group.models import Group, GroupStateTransitions, Role
+from redesign.group.utils import save_group_in_history
 from redesign.person.models import Person, Email
 
 class StreamDraftForm(forms.Form):
@@ -351,9 +352,10 @@ def clean_email(self):
 
     def save(self):
         if settings.USE_DB_REDESIGN_PROXY_CLASSES:
-            # FIXME: should save group history here
+            stream_group = Group.objects.get(acronym=self.stream.slug)
+            save_group_in_history(stream_group)
             Role.objects.get_or_create(person=self.person,
-                                       group=Group.objects.get(acronym=self.stream.slug),
+                                       group=stream_group,
                                        name=RoleName.objects.get(slug="delegate"),
                                        email=Email.objects.get(address=self.cleaned_data.get('email')))
             return

ietf/ietfworkflows/views.py

@@ -19,6 +19,8 @@
                                          is_chair_of_stream, can_adopt)
 from redesign.doc.utils import get_tags_for_stream_id
 from redesign.name.models import DocTagName
+from redesign.group.utils import save_group_in_history
+from redesign.group.models import Group, Role
 
 
 REDUCED_HISTORY_LEN = 20
@@ -125,9 +127,9 @@ def stream_delegates(request, stream_name):
         if request.POST.get('delete', False):
             pk_list = request.POST.getlist('remove_delegate')
             if settings.USE_DB_REDESIGN_PROXY_CLASSES:
-                # FIXME: should save group history here
-                from redesign.group.models import Role
-                Role.objects.filter(person__in=pk_list, group__acronym=stream.slug, name="delegate").delete()
+                stream_group = Group.objects.get(acronym=stream.slug)
+                save_group_in_history(stream_group)
+                Role.objects.filter(person__in=pk_list, group=stream_group, name="delegate").delete()
             else:
                 StreamDelegate.objects.filter(stream=stream, person__pk__in=pk_list).delete()
         else:

ietf/settings.py

@@ -156,6 +156,7 @@
     'ietf.submit',
     'ietf.ietfworkflows',
     'ietf.wgchairs',
+    'ietf.wgcharter',
 )
 
 INTERNAL_IPS = (
@@ -187,6 +188,8 @@
 INTERNET_DRAFT_PATH = '/a/www/ietf-ftp/internet-drafts/'
 INTERNET_DRAFT_PDF_PATH = '/a/www/ietf-datatracker/pdf/'
 RFC_PATH = '/a/www/ietf-ftp/rfc/'
+CHARTER_PATH = '/a/www/ietf-ftp/charters/'
+CHARTER_TXT_URL = 'http://www.ietf.org/charters/'
 AGENDA_PATH = '/a/www/www6s/proceedings/'
 AGENDA_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/agenda/%(wg)s.%(ext)s'
 MINUTES_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/minutes/%(wg)s.%(ext)s'

ietf/templates/base_leftmenu.html

@@ -42,12 +42,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>
+  {# FIXME: wgcharter <li><a href="{% url wg_search_by_area name=user|ad_area %}">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>
+  {# FIXME: wgcharter <li><a href="{% url wg_search_in_process %}">Working Groups</a></li> #}
 {% endif %}
 {% if user %}
 {% get_user_managed_streams user as stream_list %}
@@ -67,6 +67,7 @@
   </div></div></li>
 
   <li style="padding-top:0;"><a href="/wg/">Active WGs</a></li>
+  {# FIXME: wgcharter <li><a href="DEAD_BEEF_TASTY_TASTY">Proposed WGs</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>
 
@@ -83,6 +84,7 @@
   <li><a href="http://www.ietf.org/meeting/upcoming.html">Upcoming</a></li>
 
 <li class="sect">Other Documents</li>
+  {# FIXME: wgcharter <li><a href="/wgcharter/">WG Charters</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_charter_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_charter_title.html

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

ietf/templates/wgcharter/action_text.txt

@@ -0,0 +1,10 @@
+{% load ietf_filters %}{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
+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.
+
+{% include "wgcharter/wg_info.txt" %}
+
+{% endfilter %}
+{% endautoescape %}

ietf/templates/wgcharter/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 wg_view name=wg.acronym %}">Back</a>
+      <input type="submit" value="Add comment"/>
+    </td>
+  </tr>
+  </table>
+</form>
+{% endblock %}

ietf/templates/wgcharter/announcement_text.html

@@ -0,0 +1,34 @@
+{% extends "base.html" %}
+
+{% block title %}WG {{ announcement }} announcement writeup for {{ charter.chartered_group.acronym }}{% endblock %}
+
+{% block morecss %}
+form #id_announcement_text {
+  width: 700px;
+  height: 600px;
+}
+{% endblock %}
+
+{% block content %}
+<h1>WG {{ announcement }} announcement writeup for {{ charter.chartered_group.acronym }}</h1>
+
+<form action="" method="POST">
+
+  {{ announcement_text_form.announcement_text }}
+
+  <div class="actions">
+    <a href="{{ back_url }}">Back</a>
+    <input type="submit" name="save_text" value="Save WG {{ announcement }} announcement text" />
+    <input type="submit" name="regenerate_text" value="Regenerate {{ announcement }} text" />
+  </div>
+
+{% load ietf_filters %}
+{% if user|in_group:"Secretariat" %}
+  <div class="actions">
+    <input type="submit" name="send_text" value="Send WG {{ announcement }} announcement" />
+  </div>
+{% endif %}
+
+</form>
+
+{% endblock%}