Replace old charter branches with new branch based on conversion branch and some preliminary work on generalizing document handling

[[Split portion of a mixed commit.]]
 - Legacy-Id: 3883.1

Author: OleLaursen

ietf/doc/proxy.py

@@ -36,7 +36,7 @@ def id_document_key(self):
     #group = models.ForeignKey(Acronym, db_column='group_acronym_id')
     @property
     def group(self):
-        from group.proxy import Acronym as AcronymProxy
+        from ietf.group.proxy import Acronym as AcronymProxy
         g = super(InternetDraft, self).group
         return AcronymProxy().from_object(g) if g else None
     #filename = models.CharField(max_length=255, unique=True)
@@ -365,13 +365,13 @@ def prev_state(self):
     @property
     def mark_by(self):
         e = self.latest_event()
-        from person.proxy import IESGLogin as IESGLoginProxy
+        from ietf.person.proxy import IESGLogin as IESGLoginProxy
         return IESGLoginProxy().from_object(e.by) if e else None
 
     # job_owner = models.ForeignKey(IESGLogin, db_column='job_owner', related_name='documents')
     @property
     def job_owner(self):
-        from person.proxy import IESGLogin as IESGLoginProxy
+        from ietf.person.proxy import IESGLogin as IESGLoginProxy
         return IESGLoginProxy().from_object(self.ad) if self.ad else None
 
     #event_date = models.DateField(null=True)
@@ -383,7 +383,7 @@ def event_date(self):
     #area_acronym = models.ForeignKey(Area)
     @property
     def area_acronym(self):
-        from group.proxy import Area
+        from ietf.group.proxy import Area
         g = super(InternetDraft, self).group # be careful with group which is proxied
         if g and g.type_id != "individ":
             return Area().from_object(g.parent)
@@ -462,7 +462,7 @@ def noproblem(self):
     @property
     def resurrect_requested_by(self):
         e = self.latest_event(type__in=("requested_resurrect", "completed_resurrect"))
-        from person.proxy import IESGLogin as IESGLoginProxy
+        from ietf.person.proxy import IESGLogin as IESGLoginProxy
         return IESGLoginProxy().from_object(e.by) if e and e.type == "requested_resurrect" else None
 
     #approved_in_minute = models.IntegerField(null=True, blank=True)
@@ -522,7 +522,7 @@ def an_sent_date(self):
     @property
     def an_sent_by(self):
         e = self.latest_event(type="iesg_approved")
-        from person.proxy import IESGLogin as IESGLoginProxy
+        from ietf.person.proxy import IESGLogin as IESGLoginProxy
         return IESGLoginProxy().from_object(e.by) if e else None
 
     #defer = models.BooleanField()
@@ -535,7 +535,7 @@ def defer(self):
     @property
     def defer_by(self):
         e = self.latest_event(type="changed_document", desc__startswith="State changed to <b>IESG Evaluation - Defer</b>")
-        from person.proxy import IESGLogin as IESGLoginProxy
+        from ietf.person.proxy import IESGLogin as IESGLoginProxy
         return IESGLoginProxy().from_object(e.by) if e else None
 
     #defer_date = models.DateField(null=True, blank=True)
@@ -572,7 +572,7 @@ def ballot_issued(self):
     #     return remarks
     def active_positions(self):
         """Returns a list of dicts, with AD and Position tuples"""
-        from person.proxy import IESGLogin as IESGLoginProxy
+        from ietf.person.proxy import IESGLogin as IESGLoginProxy
         from ietf.doc.utils import active_ballot_positions
 
         res = []
@@ -892,7 +892,7 @@ def filename(self):
 
     @property
     def ipr(self):
-        from ipr.models import IprDraftProxy
+        from ietf.ipr.models import IprDraftProxy
         return IprDraftProxy.objects.filter(doc_alias=self.pk)
 
     class Meta:

ietf/group/proxy.py

@@ -138,7 +138,7 @@ def status_id(self):
     #meeting_scheduled = models.CharField(blank=True, max_length=3)
     @property
     def meeting_scheduled(self):
-        from meeting.models import Meeting
+        from ietf.meeting.models import Meeting
         latest_meeting = Meeting.objects.order_by('-date')[0]
         return "YES" if self.session_set.filter(meeting=latest_meeting) else "NO"
     #email_address = models.CharField(blank=True, max_length=60)

ietf/idrfc/generate_fixtures.py

@@ -14,8 +14,8 @@
 # script
 from django.core.serializers import serialize
 from django.db.models import Q 
-from idtracker.models import *
-from iesg.models import *
+from ietf.idtracker.models import *
+from ietf.iesg.models import *
 
 def output(name, qs):
     try:

ietf/idrfc/urls.py

@@ -40,10 +40,13 @@
     (r'^active/$', views_search.active),
     (r'^in-last-call/$', views_search.in_last_call),
     url(r'^ad/(?P<name>[A-Za-z0-9.-]+)/$', views_search.by_ad, name="doc_search_by_ad"),
-                       
-    url(r'^(?P<name>[A-Za-z0-9.-]+)/((?P<tab>ballot|writeup|history)/)?$', views_doc.document_main, name="doc_view"),
+
+    url(r'^(?P<name>[A-Za-z0-9.-]+)/$', views_doc.document_main, name="doc_view"),
+    url(r'^(?P<name>[A-Za-z0-9.-]+)/history/$', views_doc.document_history),
+    url(r'^(?P<name>[A-Za-z0-9.-]+)/writeup/$', views_doc.document_writeup),
+    url(r'^(?P<name>[A-Za-z0-9.-]+)/ballot/$', views_doc.document_ballot),
     (r'^(?P<name>[A-Za-z0-9.-]+)/doc.json$', views_doc.document_debug),
-    (r'^(?P<name>[A-Za-z0-9.-]+)/_ballot.data$', views_doc.document_ballot),
+    (r'^(?P<name>[A-Za-z0-9.-]+)/_ballot.data$', views_doc.ballot_html), # why is this url so weird instead of just ballot.html?
     (r'^(?P<name>[A-Za-z0-9.-]+)/ballot.tsv$', views_doc.ballot_tsv),
     (r'^(?P<name>[A-Za-z0-9.-]+)/ballot.json$', views_doc.ballot_json),
 

ietf/idrfc/views_doc.py

@@ -51,6 +51,52 @@
 from ietf.idrfc.idrfc_wrapper import BallotWrapper, IdWrapper, RfcWrapper
 from ietf.ietfworkflows.utils import get_full_info_for_draft
 
+def render_document_top(request, doc, tab):
+    tabs = []
+    tabs.append(("Document", "document", urlreverse("idrfc.views_doc.document_main", kwargs=dict(name=doc.name))))
+
+    if doc_type == "draft":
+        tabs.append(("IESG Evaluation Record", "ballot", urlreverse("idrfc.views_doc.document_ballot", kwargs=dict(name=doc.name))))
+    elif doc_type == "charter":
+        tabs.append(("IESG Review", "ballot", urlreverse("idrfc.views_doc.document_ballot", kwargs=dict(name=doc.name))))
+
+    tabs.append(("IESG Writeups", "writeup", urlreverse("idrfc.views_doc.document_writeup", kwargs=dict(name=doc.name))))
+    tabs.append(("History", "history", urlreverse("idrfc.views_doc.document_history", kwargs=dict(name=doc.name))))
+
+    return render_to_string("idrfc/document_top.html",
+                            dict(doc=doc,
+                                 tabs=tabs,
+                                 selected=tab))
+
+
+def document_main(request, name):
+    if name.startswith("ietf-charter-"):
+        # FIXME: render top
+        # render content
+        # refactor history similarly? or use directly
+        # refactor writeup, generalize on names and links to edit
+        # refactor ballot to have multiple ballot typesiet
+
+        return render_to_response("idrfc/doc_tab_document.html",
+                                  {'content1':content1,
+                                   'content2':content2,
+                                   'doc': doc,
+                                   'tab': "document",
+                                   'include_text':include_text(request)},
+                              context_instance=RequestContext(request));
+
+
+    return document_main_idrfc(request, name, "document")
+
+def document_history(request, name):
+    return document_main_idrfc(request, name, "history")
+
+def document_writeup(request, name):
+    return document_main_idrfc(request, name, "writeup")
+
+def document_ballot(request, name):
+    return document_main_idrfc(request, name, "ballot")
+
 def document_debug(request, name):
     r = re.compile("^rfc([1-9][0-9]*)$")
     m = r.match(name)
@@ -114,9 +160,7 @@ def document_main_rfc(request, rfc_number, tab):
                               context_instance=RequestContext(request));
 
 @decorator_from_middleware(GZipMiddleware)
-def document_main(request, name, tab):
-    if tab is None:
-	tab = "document"
+def document_main_idrfc(request, name, tab):
     r = re.compile("^rfc([1-9][0-9]*)$")
     m = r.match(name)
     if m:
@@ -288,7 +332,7 @@ def get_ballot(name):
     ballot = BallotWrapper(id)
     return ballot, doc
 
-def document_ballot(request, name):
+def ballot_html(request, name):
     ballot, doc = get_ballot(name)
     return render_to_response('idrfc/doc_ballot.html', {'ballot':ballot, 'doc':doc}, context_instance=RequestContext(request))
 
@@ -301,3 +345,4 @@ def ballot_json(request, name):
     response = HttpResponse(mimetype='text/plain')
     response.write(json.dumps(ballot.dict(), indent=2))
     return response
+

ietf/iesg/views.py

@@ -33,6 +33,9 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import codecs, re, os, glob
+import datetime
+import tarfile
+
 from ietf.idtracker.models import IDInternal, InternetDraft,AreaGroup, Position, IESGLogin, Acronym
 from django.views.generic.list_detail import object_list
 from django.views.generic.simple import direct_to_template
@@ -50,8 +53,8 @@
 from ietf.ietfauth.decorators import group_required
 from ietf.idtracker.templatetags.ietf_filters import in_group
 from ietf.ipr.models import IprRfc, IprDraft, IprDetail
-import datetime 
-import tarfile
+from redesign.doc.models import TelechatDocEvent
+from redesign.group.models import Group
 
 def date_threshold():
     """Return the first day of the month that is 185 days ago."""
@@ -208,6 +211,23 @@ def get_doc_sectionREDESIGN(id):
         s = s + "1"
     return s
 
+def get_wg_section(wg):
+    s = ""
+    charter_slug = None
+    if wg.charter:
+        charter_slug = wg.charter.get_state_slug()
+    if wg.state_id == "proposed":
+        if charter_slug == "intrev":
+            s = '411'
+        elif charter_slug == "iesgrev":
+            s = '412'
+    elif wg.state_id == "active":
+        if charter_slug == "intrev":
+            s = '421'
+        elif charter_slug == "iesgrev":
+            s = '422'
+    return s
+
 if settings.USE_DB_REDESIGN_PROXY_CLASSES:
     get_doc_section = get_doc_sectionREDESIGN
 
@@ -253,15 +273,14 @@ def agenda_docs(date, next_agenda):
     return res
 
 def agenda_wg_actions(date):
-    mapping = {12:'411', 13:'412',22:'421',23:'422'}
-    matches = WGAction.objects.filter(agenda=1,telechat_date=date,category__in=mapping.keys()).order_by('category')
-    res = {}
-    for o in matches:
-        section_key = "s"+mapping[o.category]
+    matches = Group.objects.filter(charter__docevent__telechatdocevent__telechat_date=date)
+
+    res = dict(("s%s%s%s" % (i, j, k), []) for i in range(2, 5) for j in range (1, 4) for k in range(1, 4))
+    for wg in matches:
+        section_key = "s" + get_wg_section(wg)
         if section_key not in res:
             res[section_key] = []
-        area = AreaGroup.objects.get(group=o.group_acronym)
-        res[section_key].append({'obj':o, 'area':str(area.area)})
+        res[section_key].append({'obj':wg})
     return res
 
 def agenda_management_issues(date):

ietf/ietfauth/urls.py

@@ -18,5 +18,4 @@
         url(r'^reset/$', 'password_reset_view', name='password_reset'),
         url(r'^reset/confirm/(?P<username>[\w.@+-]+)/(?P<date>[\d]+)/(?P<realm>[\w]+)/(?P<reset_hash>[a-f0-9]+)/$', 'confirm_password_reset', name='confirm_password_reset'),
         url(r'^ajax/check_username/$', 'ajax_check_username', name='ajax_check_username'),
-
 )

ietf/ipr/views.py

@@ -49,7 +49,7 @@ def list_drafts(request):
                     mimetype="text/plain")
 
 def list_draftsREDESIGN(request):
-    from ipr.models import IprDocAlias
+    from ietf.ipr.models import IprDocAlias
 
     docipr = {}
 

ietf/templates/base.html

@@ -65,7 +65,7 @@
 <div id="ietf-login" class="noprint">{% if user.is_authenticated %}
 {{ user }}
 {% else %}
-<a href="https://datatracker.ietf.org/accounts/login/?next={{request.get_full_path|urlencode}}" rel="nofollow">Sign In</a>
+<a href="https://{{ request.get_host }}/accounts/login/?next={{request.get_full_path|urlencode}}" rel="nofollow">Sign In</a>
 {% endif %}</div>
 {% endif %}
 

ietf/templates/base_leftmenu.html

@@ -42,11 +42,13 @@
   <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 ietf.iesg.views.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 ietf.iesg.views.working_group_actions %}">Working Groups</a></li>
   {# FIXME: wgcharter <li><a href="{% url wg_search_in_process %}">Working Groups</a></li> #}
 {% endif %}
 {% if user %}