Merged in support for RG pages, from branch/iola/rg-support.

 - Legacy-Id: 7866

Author: levkowetz

changelog

@@ -1,3 +1,14 @@
+ietfdb (5.5.0) ietf; urgency=medium
+
+  This is a feature release, which introduces pages and workflow support for
+  IRTF RGs, similar to what is available for IETF WGs.  You'll find the rg pages
+  under /rg/, for instance https://datatracker.ietf.org/rg/cfrg .  Having this
+  new baseline in place, I'm sure we'll get requests for refinements, but
+  that's the name of the game :-)
+
+ -- Henrik Levkowetz <henrik@levkowetz.com>  03 Jun 2014 23:12:44 -0200
+
+
 ietfdb (5.4.3) ietf; urgency=medium
 
   * Merged in [7772] from rjsparks@nostrum.com:

ietf/bin/send-milestone-reminders

@@ -11,7 +11,7 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
 
 syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_LOCAL0)
 
-from ietf.wginfo.mails import *
+from ietf.group.mails import *
 
 today = datetime.date.today()
 

ietf/community/display.py

@@ -88,7 +88,7 @@ def get_value(self, document, raw=False):
         if raw:
             return document.group.acronym
         else:
-            return '<a href="%s">%s</a>' % (urlreverse('wg_docs', kwargs={'acronym':document.group.acronym}), document.group.acronym) if (document.group and document.group.acronym != 'none')  else ''
+            return '<a href="%s">%s</a>' % (urlreverse('group_docs', kwargs=dict(group_type=document.group.type_id, acronym=document.group.acronym)), document.group.acronym) if (document.group and document.group.acronym != 'none')  else ''
 
 
 class ADField(DisplayField):

ietf/doc/models.py

@@ -270,8 +270,12 @@ def canonical_name(self):
             a = self.docalias_set.filter(name__startswith="rfc")
             if a:
                 name = a[0].name
-        elif self.type_id == "charter":
-            return "charter-ietf-%s" % self.chartered_group.acronym
+#         elif self.type_id == "charter":
+#             if self.group.type.slug == "rg":
+#                 top_org = "irtf"
+#             else:
+#                 top_org = "ietf"
+#             return "charter-%s-%s" % (top_org, self.chartered_group.acronym)
         return name
 
     def canonical_docalias(self):

ietf/doc/views_charter.py

@@ -51,6 +51,7 @@
 from ietf.doc.mails import email_ad
 from ietf.doc.views_status_change import RELATION_SLUGS as status_change_relationships
 from ietf.group.models import Role
+from ietf.group.utils import can_manage_group_type
 from ietf.ietfauth.utils import has_role, is_authorized_in_doc_stream, user_is_person, role_required
 from ietf.name.models import StreamName, BallotPositionName
 from ietf.person.models import Email
@@ -63,10 +64,10 @@ def render_document_top(request, doc, tab, name):
     ballot = doc.latest_event(BallotDocEvent, type="created_ballot")
     if doc.type_id in ("draft","conflrev", "statchg"):
         tabs.append(("IESG Evaluation Record", "ballot", urlreverse("doc_ballot", kwargs=dict(name=name)), ballot,  None if ballot else "IESG Evaluation Ballot has not been created yet"))
-    elif doc.type_id == "charter":
-        tabs.append(("IESG Review", "ballot", urlreverse("doc_ballot", kwargs=dict(name=name)), ballot, None if ballot else "IEST Review Ballot has not been created yet"))
+    elif doc.type_id == "charter" and doc.group.type_id == "wg":
+        tabs.append(("IESG Review", "ballot", urlreverse("doc_ballot", kwargs=dict(name=name)), ballot, None if ballot else "IESG Review Ballot has not been created yet"))
 
-    if doc.type_id not in ["conflrev", "statchg"]:
+    if doc.type_id == "draft" or (doc.type_id == "charter" and doc.group.type_id == "wg"):
         tabs.append(("IESG Writeups", "writeup", urlreverse("doc_writeup", kwargs=dict(name=name)), True))
 
     tabs.append(("History", "history", urlreverse("doc_history", kwargs=dict(name=name)), True))
@@ -239,7 +240,7 @@ def document_main(request, name, rev=None):
         elif group.type_id in ("rg", "wg"):
             submission = "%s %s" % (group.acronym, group.type)
             if group.type_id == "wg":
-                submission = "<a href=\"%s\">%s</a>" % (urlreverse("wg_docs", kwargs=dict(acronym=doc.group.acronym)), submission)
+                submission = "<a href=\"%s\">%s</a>" % (urlreverse("group_docs", kwargs=dict(group_type=doc.group.type_id, acronym=doc.group.acronym)), submission)
             if doc.stream_id and doc.get_state_slug("draft-stream-%s" % doc.stream_id) == "c-adopt":
                 submission = "candidate for %s" % submission
 
@@ -410,6 +411,8 @@ def document_main(request, name, rev=None):
         if chartering and not snapshot:
             milestones = doc.group.groupmilestone_set.filter(state="charter")
 
+        can_manage = can_manage_group_type(request.user, doc.group.type_id)
+
         return render_to_response("doc/document_charter.html",
                                   dict(doc=doc,
                                        top=top,
@@ -422,6 +425,7 @@ def document_main(request, name, rev=None):
                                        ballot_summary=ballot_summary,
                                        group=group,
                                        milestones=milestones,
+                                       can_manage=can_manage,
                                        ),
                                   context_instance=RequestContext(request))
 

ietf/doc/views_doc.py

@@ -2,7 +2,7 @@
 from django.views.generic import RedirectView
 
 from ietf.doc.feeds import DocumentChangesFeed, InLastCallFeed
-from ietf.wginfo.feeds import GroupChangesFeed
+from ietf.group.feeds import GroupChangesFeed
 from ietf.iesg.feeds import IESGAgendaFeed
 from ietf.ipr.feeds import LatestIprDisclosuresFeed
 from ietf.liaisons.feeds import LiaisonStatementsFeed