Merge changes from attic/shimfree into new branch to complete rebasing shimfree on trunk

 - Legacy-Id: 6215

Author: OleLaursen

bin/mkdiagram

@@ -9,7 +9,7 @@ trap 'echo "$program($LINENO): Command failed with error code $? ($0 $*)"; exit
 if [ "$*" ]; then apps="$@"; graph="${1%.*}"; else apps=$(ls */models.py | sed 's!/models.py!!'); graph="models"; fi
 
 newapps="doc group meeting message person name"
-legacyapps="announcements idindex idrfc idtracker iesg ietfauth ietfworkflows ipr liaisons mailinglists proceedings redirects submit wgchairs wgcharter wginfo"
+legacyapps="announcements idindex idrfc idtracker iesg ietfauth ietfworkflows ipr liaisons mailinglists proceedings redirects submit wgcharter wginfo"
 
 proxy="$(grep ^class */proxy.py | tr '()' '  ' | awk '{printf $2 ","}')"
 names="$(grep ^class name/models.py | tr '()' '  ' | awk '{printf $2 ","}')"

ietf/doc/proxy.py

@@ -194,11 +194,6 @@ def idinternal(self):
     def authors(self):
         return IDAuthor.objects.filter(document=self)
 
-    @property
-    def protowriteup_set(self):
-        from ietf.wgchairs.models import ProtoWriteUpProxy
-        return ProtoWriteUpProxy.objects.filter(doc=self, type="changed_protocol_writeup")
-
     # methods from InternetDraft
     def displayname(self):
         return self.name

ietf/doc/templatetags/ietf_filters.py

@@ -9,6 +9,7 @@
 from django.template import resolve_variable
 from django.utils.safestring import mark_safe, SafeData
 from django.utils import simplejson
+from django.utils.html import strip_tags
 try:
     from email import utils as emailutils
 except ImportError:
@@ -475,6 +476,14 @@ def state(doc, slug):
         slug = "%s-stream-%s" % (doc.type_id, doc.stream_id)
     return doc.get_state(slug)
 
+@register.filter
+def statehelp(state):
+    "Output help icon with tooltip for state."
+    from django.core.urlresolvers import reverse as urlreverse
+    tooltip = escape(strip_tags(state.desc))
+    url = urlreverse("state_help", kwargs=dict(type=state.type_id)) + "#" + state.slug
+    return mark_safe('<a class="state-help-icon" href="%s" title="%s">?</a>' % (url, tooltip))
+
 def _test():
     import doctest
     doctest.testmod()
@@ -483,11 +492,10 @@ def _test():
     _test()
 
 @register.filter
-def plural(text, list, arg=u's'):
+def plural(text, seq, arg=u's'):
     "Similar to pluralize, but looks at the text, too"
     from django.template.defaultfilters import pluralize
     if text.endswith('s'):
         return text
     else:
-        return text + pluralize(len(list), arg)
-        
+        return text + pluralize(len(seq), arg)

ietf/doc/views_help.py

@@ -3,12 +3,14 @@
 from django.template import RequestContext
 
 from ietf.doc.models import *
+from ietf.doc.utils import get_tags_for_stream_id
 
 def state_help(request, type):
     slug, title = {
         "draft-iesg": ("draft-iesg", "IESG States For Internet-Drafts"),
         "draft-rfceditor": ("draft-rfceditor", "RFC Editor States For Internet-Drafts"),
         "draft-iana-action": ("draft-iana-action", "IANA Action States For Internet-Drafts"),
+        "draft-stream-ietf": ("draft-stream-ietf", "IETF Stream States For Internet-Drafts"),
         "charter": ("charter", "Charter States"),
         "conflict-review": ("conflrev", "Conflict Review States"),
         "status-change": ("statchg", "RFC Status Change States"),
@@ -35,12 +37,14 @@ def state_help(request, type):
         states.insert(0, fake_state)
 
         tags = DocTagName.objects.filter(slug__in=IESG_SUBSTATE_TAGS)
+    elif state_type.slug.startswith("draft-stream-"):
+        possible = get_tags_for_stream_id(state_type.slug.replace("draft-stream-", ""))
+        tags = DocTagName.objects.filter(slug__in=possible)
 
     return render_to_response("doc/state_help.html", {
             "title": title,
             "state_type": state_type,
             "states": states,
             "has_next_states": has_next_states,
             "tags": tags,
-            },
-                              context_instance=RequestContext(request))
+            }, context_instance=RequestContext(request))

ietf/group/proxy.py

@@ -94,6 +94,19 @@ def proxied_role_emails(emails):
         proxy_role_email(e)
     return emails
 
+class WGDelegateProxy(Role):
+        #person = models.ForeignKey(PersonOrOrgInfo) # same name
+        #wg = models.ForeignKey(IETFWG)
+        @property
+        def wg(self):
+            return self.group
+
+        def __unicode__(self):
+            return u"%s" % self.person
+
+        class Meta:
+            proxy = True
+
 class IETFWG(Group):
     objects = TranslatingManager(dict(group_acronym="id",
                                       group_acronym__acronym="acronym",
@@ -211,8 +224,7 @@ class Dummy: pass
         return d
     @property
     def wgdelegate_set(self):
-        from ietf.wgchairs.models import WGDelegate
-        return WGDelegate.objects.filter(group=self, name="delegate")
+        return WGDelegateProxy.objects.filter(group=self, name="delegate")
 
     class Meta:
         proxy = True

ietf/ietfworkflows/forms.py

@@ -7,7 +7,6 @@
 from workflows.utils import set_workflow_for_object
 
 from ietf.idtracker.models import PersonOrOrgInfo, IETFWG, InternetDraft
-from ietf.wgchairs.accounts import get_person_for_user
 from ietf.ietfworkflows.models import Stream, StreamDelegate
 from ietf.ietfworkflows.utils import (get_workflow_for_draft, get_workflow_for_wg,
                                       get_state_for_draft, get_state_by_name,
@@ -33,7 +32,10 @@ class StreamDraftForm(forms.Form):
     def __init__(self, *args, **kwargs):
         self.draft = kwargs.pop('draft', None)
         self.user = kwargs.pop('user', None)
-        self.person = get_person_for_user(self.user)
+        try:
+            self.person = self.user.get_profile()
+        except:
+            self.person = None
         self.workflow = get_workflow_for_draft(self.draft)
         self.message = {}
         super(StreamDraftForm, self).__init__(*args, **kwargs)

ietf/ietfworkflows/templatetags/ietf_streams.py

@@ -5,8 +5,6 @@
 from ietf.idrfc.idrfc_wrapper import IdRfcWrapper, IdWrapper
 from ietf.ietfworkflows.utils import (get_workflow_for_draft,
                                       get_state_for_draft)
-from ietf.wgchairs.accounts import (can_manage_shepherd_of_a_document,
-                                    can_manage_writeup_of_a_document)
 from ietf.ietfworkflows.streams import get_stream_from_wrapper
 from ietf.ietfworkflows.models import Stream
 from ietf.ietfworkflows.accounts import (can_edit_state, can_edit_stream,

ietf/ietfworkflows/templatetags/ietf_streams_redesign.py

@@ -5,8 +5,6 @@
 from ietf.idrfc.idrfc_wrapper import IdRfcWrapper, IdWrapper
 from ietf.ietfworkflows.utils import (get_workflow_for_draft,
                                       get_state_for_draft)
-from ietf.wgchairs.accounts import (can_manage_shepherd_of_a_document,
-                                    can_manage_writeup_of_a_document)
 from ietf.ietfworkflows.streams import get_stream_from_wrapper
 from ietf.ietfworkflows.models import Stream
 from ietf.ietfworkflows.accounts import (can_edit_state, can_edit_stream,

ietf/secr/announcement/forms.py

@@ -7,7 +7,6 @@
 
 from ietf.message.models import Message
 from ietf.ietfauth.decorators import has_role
-from ietf.wgchairs.accounts import get_person_for_user
 
 # ---------------------------------------------
 # Globals
@@ -180,7 +179,7 @@ def clean(self):
     def save(self, *args, **kwargs):
         user = kwargs.pop('user')
         message = super(AnnounceForm, self).save(commit=False)
-        message.by = get_person_for_user(user)
+        message.by = user.get_profile()
         if self.cleaned_data['to'] == 'Other...':
             message.to = self.cleaned_data['to_custom']
         if kwargs['commit']:

ietf/secr/announcement/views.py

@@ -6,7 +6,6 @@
 
 from ietf.ietfauth.decorators import has_role
 from ietf.utils.mail import send_mail_text
-from ietf.wgchairs.accounts import get_person_for_user
 from ietf.group.models import Group
 from ietf.secr.utils.group import current_nomcom
 from ietf.secr.utils.decorators import check_for_cancel
@@ -111,4 +110,4 @@ def confirm(request):
         'message': data,
         'to': to},
         RequestContext(request, {}),
-    )
+    )