Merged in branch/amsl/liaisons/6.4.1@10160 from rcross@amsl.com, bringing in the new liaison tool.

 - Legacy-Id: 10161

Author: levkowetz

ietf/ietfauth/utils.py

@@ -54,6 +54,7 @@ def has_role(user, role_names, *args, **kwargs):
 	    "IETF Chair": Q(person=person, name="chair", group__acronym="ietf"),
 	    "IRTF Chair": Q(person=person, name="chair", group__acronym="irtf"),
 	    "IAB Chair": Q(person=person, name="chair", group__acronym="iab"),
+	    "IAB Executive Director": Q(person=person, name="execdir", group__acronym="iab"),
             "IAB Group Chair": Q(person=person, name="chair", group__type="iab", group__state="active"),
 	    "WG Chair": Q(person=person,name="chair", group__type="wg", group__state__in=["active","bof", "proposed"]),
 	    "WG Secretary": Q(person=person,name="secr", group__type="wg", group__state__in=["active","bof", "proposed"]),
@@ -64,6 +65,8 @@ def has_role(user, role_names, *args, **kwargs):
             "Nomcom Chair": Q(person=person, name="chair", group__type="nomcom", group__state="active", group__acronym__icontains=kwargs.get('year', '0000')),
             "Nomcom Advisor": Q(person=person, name="advisor", group__type="nomcom", group__state="active", group__acronym__icontains=kwargs.get('year', '0000')),
             "Nomcom": Q(person=person, group__type="nomcom", group__state="active", group__acronym__icontains=kwargs.get('year', '0000')),
+            "Liaison Manager": Q(person=person,name="liaiman",group__type="sdo",group__state="active", ),
+            "Authorized Individual": Q(person=person,name="auth",group__type="sdo",group__state="active", ),
             }
 
         filter_expr = Q()

ietf/liaisons/accounts.py

@@ -1,10 +1,44 @@
 from django.contrib import admin
+from django.core.urlresolvers import reverse
 
-from ietf.liaisons.models import LiaisonStatement
+from ietf.liaisons.models import  ( LiaisonStatement, LiaisonStatementEvent,
+    LiaisonStatementGroupContacts, RelatedLiaisonStatement, LiaisonStatementAttachment )
+
+
+class RelatedLiaisonStatementInline(admin.TabularInline):
+    model = RelatedLiaisonStatement
+    fk_name = 'source'
+    raw_id_fields = ['target']
+    extra = 1
+
+class LiaisonStatementAttachmentInline(admin.TabularInline):
+    model = LiaisonStatementAttachment
+    raw_id_fields = ['document']
+    extra = 1
 
 class LiaisonStatementAdmin(admin.ModelAdmin):
-    list_display = ['id', 'title', 'from_name', 'to_name', 'submitted', 'purpose', 'related_to']
+    list_display = ['id', 'title', 'submitted', 'from_groups_short_display', 'purpose', 'related_to']
     list_display_links = ['id', 'title']
     ordering = ('title', )
-    raw_id_fields = ('from_contact', 'related_to', 'from_group', 'to_group', 'attachments')
+    raw_id_fields = ('from_contact', 'attachments', 'from_groups', 'to_groups')
+    #filter_horizontal = ('from_groups', 'to_groups')
+    inlines = [ RelatedLiaisonStatementInline, LiaisonStatementAttachmentInline ]
+
+    def related_to(self, obj):
+        return '<br />'.join(['<a href="%s">%s</a>' % (reverse('admin:liaisons_liaisonstatement_change', None, (i.target.id, )), str(i.target)) for i in obj.source_of_set.select_related('target').all()])
+    related_to.allow_tags = True
+
+class LiaisonStatementEventAdmin(admin.ModelAdmin):
+    list_display = ["statement", "type", "by", "time"]
+    search_fields = ["statement__title", "by__name"]
+    raw_id_fields = ["statement", "by"]
+
+class LiaisonStatementGroupContactsAdmin(admin.ModelAdmin):
+    list_display = ["group", "contacts"]
+    raw_id_fields = ["group"]
+    search_fields = ["group__acronym", "contacts"]
+    ordering = ["group__name"]
+
 admin.site.register(LiaisonStatement, LiaisonStatementAdmin)
+admin.site.register(LiaisonStatementEvent, LiaisonStatementEventAdmin)
+admin.site.register(LiaisonStatementGroupContacts, LiaisonStatementGroupContactsAdmin)

ietf/liaisons/admin.py

@@ -16,24 +16,24 @@
 # to construct a queryset.
 class LiaisonStatementsFeed(Feed):
     feed_type = Atom1Feed
-    link = reverse_lazy("liaison_list")
+    link = reverse_lazy("ietf.liaisons.views.liaison_list")
     description_template = "liaisons/feed_item_description.html"
 
     def get_object(self, request, kind, search=None):
         obj = {}
 
         if kind == 'recent':
             obj['title'] = 'Recent Liaison Statements'
-	    obj['limit'] = 15
-	    return obj
+            obj['limit'] = 15
+            return obj
 
         if kind == 'from':
             if not search:
                 raise FeedDoesNotExist
 
             try:
                 group = Group.objects.get(acronym=search)
-                obj['filter'] = { 'from_group': group }
+                obj['filter'] = { 'from_groups': group }
                 obj['title'] = u'Liaison Statements from %s' % group.name
                 return obj
             except Group.DoesNotExist:
@@ -54,46 +54,47 @@ def get_object(self, request, kind, search=None):
             if not search:
                 raise FeedDoesNotExist
 
-            obj['filter'] = dict(to_name__icontains=search)
-            obj['title'] = 'Liaison Statements where to matches %s' % search
+            group = Group.objects.get(acronym=search)
+            obj['filter'] = { 'to_groups': group }
+            obj['title'] = u'Liaison Statements to %s' % group.name
             return obj
 
-	if kind == 'subject':
+        if kind == 'subject':
             if not search:
-		raise FeedDoesNotExist
+                raise FeedDoesNotExist
 
             obj['q'] = [ Q(title__icontains=search) | Q(attachments__title__icontains=search) ]
             obj['title'] = 'Liaison Statements where subject matches %s' % search
             return obj
 
-	raise FeedDoesNotExist
+        raise FeedDoesNotExist
 
     def items(self, obj):
-        qs = LiaisonStatement.objects.all().order_by("-submitted")
-	if obj.has_key('q'):
-	    qs = qs.filter(*obj['q'])
-	if obj.has_key('filter'):
-	    qs = qs.filter(**obj['filter'])
-	if obj.has_key('limit'):
-	    qs = qs[:obj['limit']]
-	return qs
+        qs = LiaisonStatement.objects.all().order_by("-id")
+        if obj.has_key('q'):
+            qs = qs.filter(*obj['q'])
+        if obj.has_key('filter'):
+            qs = qs.filter(**obj['filter'])
+        if obj.has_key('limit'):
+            qs = qs[:obj['limit']]
+        return qs
 
     def title(self, obj):
-	return obj['title']
+        return obj['title']
 
     def description(self, obj):
-	return self.title(obj)
+        return self.title(obj)
 
     def item_title(self, item):
         return render_to_string("liaisons/liaison_title.html", { 'liaison': item }).strip()
 
     def item_link(self, item):
-        return urlreverse("liaison_detail", kwargs={ "object_id": item.pk })
+        return urlreverse("ietf.liaisons.views.liaison_detail", kwargs={ "object_id": item.pk })
 
     def item_pubdate(self, item):
         # this method needs to return a datetime instance, even
-        # though the database has only date, not time 
+        # though the database has only date, not time
         return item.submitted
- 
+
     def item_author_name(self, item):
         return item.from_name

ietf/liaisons/feeds.py

@@ -7,44 +7,65 @@
 from ietf.liaisons.models import LiaisonStatement
 
 def select2_id_liaison_json(objs):
-    return json.dumps([{ "id": o.pk, "text": escape(o.title) } for o in objs])
+    return json.dumps([{ "id": o.pk, "text":u"[{}] {}".format(o.pk, escape(o.title)) } for o in objs])
 
-class SearchableLiaisonStatementField(forms.IntegerField):
+def select2_id_group_json(objs):
+    return json.dumps([{ "id": o.pk, "text": escape(o.acronym) } for o in objs])
+
+class SearchableLiaisonStatementsField(forms.CharField):
     """Server-based multi-select field for choosing liaison statements using
     select2.js."""
 
-    def __init__(self, hint_text="Type in title to search for document", *args, **kwargs):
-        super(SearchableLiaisonStatementField, self).__init__(*args, **kwargs)
+    def __init__(self,
+                 max_entries = None,
+                 hint_text="Type in title to search for document",
+                 model = LiaisonStatement,
+                 *args, **kwargs):
+        kwargs["max_length"] = 10000
+        self.model = model
+        self.max_entries = max_entries
+
+        super(SearchableLiaisonStatementsField, self).__init__(*args, **kwargs)
 
-        self.widget.attrs["class"] = "select2-field"
+        self.widget.attrs["class"] = "select2-field form-control"
         self.widget.attrs["data-placeholder"] = hint_text
-        self.widget.attrs["data-max-entries"] = 1
+        if self.max_entries != None:
+            self.widget.attrs["data-max-entries"] = self.max_entries
+
+    def parse_select2_value(self, value):
+        return [x.strip() for x in value.split(",") if x.strip()]
 
     def prepare_value(self, value):
         if not value:
-            value = None
-        elif isinstance(value, LiaisonStatement):
-            value = value
-        else:
-            value = LiaisonStatement.objects.exclude(approved=None).filter(pk=value).first()
+            value = ""
+        if isinstance(value, (int, long)):
+            value = str(value)
+        if isinstance(value, basestring):
+            pks = self.parse_select2_value(value)
+            value = self.model.objects.filter(pk__in=pks)
+        if isinstance(value, LiaisonStatement):
+            value = [value]
 
-        self.widget.attrs["data-pre"] = select2_id_liaison_json([value] if value else [])
+        self.widget.attrs["data-pre"] = select2_id_liaison_json(value)
 
         # doing this in the constructor is difficult because the URL
         # patterns may not have been fully constructed there yet
-        self.widget.attrs["data-ajax-url"] = urlreverse("ajax_select2_search_liaison_statements")
+        self.widget.attrs["data-ajax-url"] = urlreverse("ietf.liaisons.views.ajax_select2_search_liaison_statements")
 
-        return value
+        return u",".join(unicode(o.pk) for o in value)
 
     def clean(self, value):
-        value = super(SearchableLiaisonStatementField, self).clean(value)
+        value = super(SearchableLiaisonStatementsField, self).clean(value)
+        pks = self.parse_select2_value(value)
 
-        if value == None:
-            return None
+        objs = self.model.objects.filter(pk__in=pks)
 
-        obj = LiaisonStatement.objects.filter(pk=value).first()
-        if not obj and self.required:
-            raise forms.ValidationError(u"You must select a value.")
+        found_pks = [str(o.pk) for o in objs]
+        failed_pks = [x for x in pks if x not in found_pks]
+        if failed_pks:
+            raise forms.ValidationError(u"Could not recognize the following groups: {pks}.".format(pks=", ".join(failed_pks)))
 
-        return obj
+        if self.max_entries != None and len(objs) > self.max_entries:
+            raise forms.ValidationError(u"You can select at most %s entries only." % self.max_entries)
 
+        return objs