Dependencies of wgrecord to wgcharter rename

 - Legacy-Id: 3432

Author: Martin Qvist

ietf/settings.py

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

ietf/templates/base_leftmenu.html

@@ -40,7 +40,9 @@
   <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 wg_search_by_ad name=user.get_profile.person.full_name_as_key %}">Working Groups</a></li>
+  {% if user.get_profile.person.area %}
+  <li><a href="{% url wg_search_by_area name=user.get_profile.person.area.acronym %}">Working Groups</a></li>
+  {% endif %}
 {% endif %}
 {% if user|in_group:"Secretariat" %}
 <li class="sect first">Secretariat</li>
@@ -74,7 +76,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="/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>

…mplates/feeds/wg_record_description.html …plates/feeds/wg_charter_description.htmlietf/templates/feeds/wg_record_description.html renamed to ietf/templates/feeds/wg_charter_description.html ietf/templates/feeds/wg_record_description.html renamed to ietf/templates/feeds/wg_charter_description.html

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

ietf/templates/feeds/wg_charter_title.html

@@ -9,7 +9,7 @@
 from ietf.ipr.feeds import LatestIprDisclosures
 from ietf.proceedings.feeds import LatestWgProceedingsActivity
 from ietf.liaisons.feeds import Liaisons
-from ietf.wgrecord.feeds import GroupComments
+from ietf.wgcharter.feeds import GroupComments
 
 from ietf.idtracker.sitemaps import IDTrackerMap, DraftMap
 from ietf.liaisons.sitemaps import LiaisonMap
@@ -61,7 +61,7 @@
     (r'^accounts/', include('ietf.ietfauth.urls')),
     (r'^doc/', include('ietf.idrfc.urls')),
     (r'^wg/', include('ietf.wginfo.urls')),
-    (r'^wgrecord/', include('ietf.wgrecord.urls')),
+    (r'^wgcharter/', include('ietf.wgcharter.urls')),
     (r'^cookies/', include('ietf.cookies.urls')),
     (r'^submit/', include('ietf.submit.urls')),
     (r'^streams/', include('ietf.ietfworkflows.urls')),

ietf/templates/feeds/wg_record_title.html

@@ -98,7 +98,7 @@ def __unicode__(self):
     def get_absolute_url(self):
         name = self.name
         if self.type_id == "charter":
-            return urlreverse('wg_view_record', kwargs={ 'name': self.group.acronym })
+            return urlreverse('wg_view', kwargs={ 'name': self.group.acronym })
         else:
             if self.state == "rfc":
                 aliases = self.docalias_set.filter(name__startswith="rfc")

ietf/urls.py

@@ -2,7 +2,7 @@
 
 from models import *
 from doc.models import Document # for charter text
-from ietf.wgrecord.utils import get_charter_for_revision, approved_revision
+from ietf.wgcharter.utils import get_charter_for_revision, approved_revision
 
 class Acronym(Group):
     class LazyIndividualSubmitter(object):

redesign/doc/models.py

@@ -20,7 +20,7 @@
 from ietf.idtracker.models import AreaGroup, IETFWG, Area, AreaGroup, Acronym, AreaWGURL, IRTF, ChairsHistory, Role, AreaDirector
 from ietf.liaisons.models import SDOs
 
-from ietf.wgrecord.utils import set_or_create_charter
+from ietf.wgcharter.utils import set_or_create_charter
 
 # imports IETFWG, Area, AreaGroup, Acronym, IRTF, AreaWGURL, SDOs
 
@@ -264,8 +264,12 @@
     group.list_archive = l
 
     charter = set_or_create_charter(group)
-    charter.rev = "01"
-    charter.charter_state = name(CharterDocStateName, slug="approved", name="Approved", desc="The WG is approved by the IESG.")
+    if group.state_id == "active" or group.state_id == "conclude":
+        charter.rev = "01"
+        charter.charter_state = name(CharterDocStateName, slug="approved", name="Approved", desc="The WG is approved by the IESG.")
+    else:
+        charter.rev = "00"
+        charter.charter_state = name(CharterDocStateName, slug="notrev", name="Not currently under review", desc="The effort was abandoned by the IESG.")
     charter.save()
 
     group.comments = o.comments.strip() if o.comments else ""

redesign/group/proxy.py

@@ -51,6 +51,13 @@ def role_email(self, role_name, group):
         if e:
             return e[0]
         return None
+    def area(self):
+        # Returns area if AD else None
+        for e in Email.objects.filter(person=self):
+            rl = e.role_set.filter(name = "ad")
+            if rl:
+                return rl[0].group
+        return None
     def email_address(self):
         e = self.email_set.filter(active=True)
         if e: