Merged in branch/amsl/iprtool/5.7.4@8734 from rcross@amsl.com, providing new IPR models, refactored code, and improved list, search, and management interfaces.

 - Legacy-Id: 8808

Author: levkowetz

ietf/doc/mails.py

@@ -8,7 +8,7 @@
 from django.core.urlresolvers import reverse as urlreverse
 
 from ietf.utils.mail import send_mail, send_mail_text
-from ietf.ipr.search import iprs_from_docs, related_docs
+from ietf.ipr.utils import iprs_from_docs, related_docs
 from ietf.doc.models import WriteupDocEvent, BallotPositionDocEvent, LastCallDocEvent, DocAlias, ConsensusDocEvent, DocTagName
 from ietf.doc.utils import needed_ballot_positions
 from ietf.person.models import Person
@@ -112,9 +112,9 @@ def generate_last_call_announcement(request, doc):
 
     doc.filled_title = textwrap.fill(doc.title, width=70, subsequent_indent=" " * 3)
 
-    iprs, _ = iprs_from_docs(related_docs(DocAlias.objects.get(name=doc.canonical_name())))
+    iprs = iprs_from_docs(related_docs(DocAlias.objects.get(name=doc.canonical_name())))
     if iprs:
-        ipr_links = [ urlreverse("ietf.ipr.views.show", kwargs=dict(ipr_id=i.ipr_id)) for i in iprs]
+        ipr_links = [ urlreverse("ietf.ipr.views.show", kwargs=dict(id=i.id)) for i in iprs]
         ipr_links = [ settings.IDTRACKER_BASE_URL+url if not url.startswith("http") else url for url in ipr_links ]
     else:
         ipr_links = None

ietf/doc/models.py

@@ -492,10 +492,10 @@ def friendly_state(self):
         else:
             return state.name
 
-    def ipr(self):
-        """Returns the IPR disclosures against this document (as a queryset over IprDocAlias)."""
-        from ietf.ipr.models import IprDocAlias
-        return IprDocAlias.objects.filter(doc_alias__document=self)
+    def ipr(self,states=('posted','removed')):
+        """Returns the IPR disclosures against this document (as a queryset over IprDocRel)."""
+        from ietf.ipr.models import IprDocRel
+        return IprDocRel.objects.filter(document__document=self,disclosure__state__in=states)
 
     def related_ipr(self):
         """Returns the IPR disclosures against this document and those documents this

ietf/doc/templatetags/ietf_filters.py

@@ -9,13 +9,17 @@
 from ietf.doc.models import ConsensusDocEvent
 from django import template
 from django.utils.html import escape, fix_ampersands
+from django.utils.text import wrap
 from django.template.defaultfilters import truncatewords_html, linebreaksbr, stringfilter, urlize
 from django.template import resolve_variable
 from django.utils.safestring import mark_safe, SafeData
 from django.utils.html import strip_tags
 
 register = template.Library()
 
+def collapsebr(html):
+    return re.sub('(<(br ?/|/p)>[ \n]*)(<(br) ?/?>[ \n]*)*(<(br|p) ?/?>[ \n]*)', '\\1\\5', html)
+
 @register.filter(name='expand_comma')
 def expand_comma(value):
     """
@@ -280,7 +284,7 @@ def split(text, splitter=None):
     return text.split(splitter)
 
 @register.filter(name="wrap_long_lines")
-def wrap_long_lines(text):
+def wrap_long_lines(text, width=72):
     """Wraps long lines without loosing the formatting and indentation
        of short lines"""
     if not isinstance(text, (types.StringType,types.UnicodeType)):
@@ -441,26 +445,26 @@ def ad_area(user):
     return None
 
 @register.filter
-def format_history_text(text):
+def format_history_text(text, trunc_words=25):
     """Run history text through some cleaning and add ellipsis if it's too long."""
     full = mark_safe(text)
 
     if text.startswith("This was part of a ballot set with:"):
         full = urlize_ietf_docs(full)
 
-    return format_snippet(full)
+    return format_snippet(full, trunc_words)
 
 @register.filter
-def format_snippet(text): 
-    full = mark_safe(keep_spacing(linebreaksbr(urlize(sanitize_html(text)))))
-    snippet = truncatewords_html(full, 25)
+def format_snippet(text, trunc_words=25): 
+    full = mark_safe(keep_spacing(collapsebr(linebreaksbr(urlize(sanitize_html(text))))))
+    snippet = truncatewords_html(full, trunc_words)
     if snippet != full:
         return mark_safe(u'<div class="snippet">%s<span class="show-all">[show all]</span></div><div style="display:none" class="full">%s</div>' % (snippet, full))
     return full
 
 @register.filter
 def format_editable_snippet(text,link): 
-    full = mark_safe(keep_spacing(linebreaksbr(urlize(sanitize_html(text)))))
+    full = mark_safe(keep_spacing(collapsebr(linebreaksbr(urlize(sanitize_html(text))))))
     snippet = truncatewords_html(full, 25)
     if snippet != full:
         return mark_safe(u'<div class="snippet">%s<span class="show-all">[show all]</span></div><div style="display:none" class="full">%s' % (format_editable(snippet,link),format_editable(full,link)) )
@@ -529,3 +533,33 @@ def consensus(doc):
     else:
         return "Unknown"
 
+# The function and class below provides a tag version of the builtin wordwrap filter
+# https://djangosnippets.org/snippets/134/
+@register.tag
+def wordwrap(parser, token):
+    """
+    This is a tag version of the Django builtin 'wordwrap' filter.  This is useful
+    if you need to wrap a combination of fixed template text and template variables.
+
+    Usage:
+    
+    {% wordwrap 80 %}
+    some really long text here, including template variable expansion, etc.
+    {% endwordwrap %}
+    """
+    try:
+        tag_name, len = token.split_contents()
+    except ValueError:
+        raise template.TemplateSyntaxError, "The wordwrap tag requires exactly one argument: width."
+    nodelist = parser.parse(('endwordwrap',))
+    parser.delete_first_token()
+    return WordWrapNode(nodelist, len)
+
+class WordWrapNode(template.Node):
+    def __init__(self, nodelist, len):
+        self.nodelist = nodelist
+        self.len = len
+    
+    def render(self, context):
+        return wrap(str(self.nodelist.render(context)), int(self.len))
+

ietf/ipr/admin.py

@@ -1,28 +1,106 @@
 #coding: utf-8
+from django import forms
 from django.contrib import admin
-from ietf.ipr.models import IprContact, IprDetail, IprDocAlias, IprNotification, IprUpdate
-                
-class IprContactAdmin(admin.ModelAdmin):
-    list_display=('__str__', 'ipr')
-admin.site.register(IprContact, IprContactAdmin)
-
-class IprDetailAdmin(admin.ModelAdmin):
-    list_display = ['title', 'submitted_date', 'docs', 'status']
+from ietf.name.models import DocRelationshipName
+from ietf.ipr.models import (IprNotification, IprDisclosureBase, IprDocRel, IprEvent,
+    RelatedIpr, HolderIprDisclosure, ThirdPartyIprDisclosure, GenericIprDisclosure, 
+    NonDocSpecificIprDisclosure)
+
+# ------------------------------------------------------
+# ModelAdmins
+# ------------------------------------------------------
+class IprDocRelAdminForm(forms.ModelForm):
+    class Meta:
+        model = IprDocRel
+        widgets = {
+          'sections':forms.TextInput,
+        }
+
+class IprDocRelInline(admin.TabularInline):
+    model = IprDocRel
+    form = IprDocRelAdminForm
+    raw_id_fields = ['document']
+    extra = 1
+
+class RelatedIprInline(admin.TabularInline):
+    model = RelatedIpr
+    raw_id_fields = ['target']
+    fk_name = 'source'
+    extra = 1
+    
+    def formfield_for_foreignkey(self, db_field, request, **kwargs):
+        if db_field.name == "relationship":
+            kwargs["queryset"] = DocRelationshipName.objects.filter(slug='updates')
+        return super(RelatedIprInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
+        
+class IprDisclosureBaseAdmin(admin.ModelAdmin):
+    list_display = ['title', 'time', 'related_docs', 'state']
     search_fields = ['title', 'legal_name']
+    raw_id_fields = ['by']
+    inlines = [IprDocRelInline,RelatedIprInline]
+    
+    def related_docs(self, obj):
+        return u", ".join(a.formatted_name() for a in IprDocRel.objects.filter(disclosure=obj).order_by("id").select_related("document"))
+
+admin.site.register(IprDisclosureBase, IprDisclosureBaseAdmin)
+
+class HolderIprDisclosureAdmin(admin.ModelAdmin):
+    list_display = ['title', 'time', 'related_docs', 'state']
+    raw_id_fields = ["by"]
+    inlines = [IprDocRelInline,RelatedIprInline]
+    
+    def related_docs(self, obj):
+        return u", ".join(a.formatted_name() for a in IprDocRel.objects.filter(disclosure=obj).order_by("id").select_related("document"))
+
+admin.site.register(HolderIprDisclosure, HolderIprDisclosureAdmin)
 
-    def docs(self, ipr):
-        return u", ".join(a.formatted_name() for a in IprDocAlias.objects.filter(ipr=ipr).order_by("id").select_related("doc_alias"))
+class ThirdPartyIprDisclosureAdmin(admin.ModelAdmin):
+    list_display = ['title', 'time', 'related_docs', 'state']
+    raw_id_fields = ["by"]
+    inlines = [IprDocRelInline,RelatedIprInline]
+    
+    def related_docs(self, obj):
+        return u", ".join(a.formatted_name() for a in IprDocRel.objects.filter(disclosure=obj).order_by("id").select_related("document"))
 
-admin.site.register(IprDetail, IprDetailAdmin)
+admin.site.register(ThirdPartyIprDisclosure, ThirdPartyIprDisclosureAdmin)
+
+class GenericIprDisclosureAdmin(admin.ModelAdmin):
+    list_display = ['title', 'time', 'related_docs', 'state']
+    raw_id_fields = ["by"]
+    inlines = [RelatedIprInline]
+    
+    def related_docs(self, obj):
+        return u", ".join(a.formatted_name() for a in IprDocRel.objects.filter(disclosure=obj).order_by("id").select_related("document"))
+
+admin.site.register(GenericIprDisclosure, GenericIprDisclosureAdmin)
+
+class NonDocSpecificIprDisclosureAdmin(admin.ModelAdmin):
+    list_display = ['title', 'time', 'related_docs', 'state']
+    raw_id_fields = ["by"]
+    inlines = [RelatedIprInline]
+    
+    def related_docs(self, obj):
+        return u", ".join(a.formatted_name() for a in IprDocRel.objects.filter(disclosure=obj).order_by("id").select_related("document"))
+
+admin.site.register(NonDocSpecificIprDisclosure, NonDocSpecificIprDisclosureAdmin)
 
 class IprNotificationAdmin(admin.ModelAdmin):
     pass
 admin.site.register(IprNotification, IprNotificationAdmin)
 
-class IprUpdateAdmin(admin.ModelAdmin):
-    pass
-admin.site.register(IprUpdate, IprUpdateAdmin)
+class IprDocRelAdmin(admin.ModelAdmin):
+    raw_id_fields = ["disclosure", "document"]
+admin.site.register(IprDocRel, IprDocRelAdmin)
+
+class RelatedIprAdmin(admin.ModelAdmin):
+    list_display = ['source', 'target', 'relationship', ]
+    search_fields = ['source__name', 'target__name', 'target__document__name', ]
+    raw_id_fields = ['source', 'target', ]
+admin.site.register(RelatedIpr, RelatedIprAdmin)
 
-class IprDocAliasAdmin(admin.ModelAdmin):
-    raw_id_fields = ["ipr", "doc_alias"]
-admin.site.register(IprDocAlias, IprDocAliasAdmin)
+class IprEventAdmin(admin.ModelAdmin):
+    list_display = ["disclosure", "type", "by", "time"]
+    list_filter = ["time", "type"]
+    search_fields = ["disclosure__title", "by__name"]
+    raw_id_fields = ["disclosure", "by", "message", "in_reply_to"]
+admin.site.register(IprEvent, IprEventAdmin)

ietf/ipr/feeds.py

@@ -1,13 +1,11 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-import datetime
-
 from django.contrib.syndication.views import Feed
 from django.utils.feedgenerator import Atom1Feed
 from django.core.urlresolvers import reverse_lazy
 from django.utils.safestring import mark_safe
 
-from ietf.ipr.models import IprDetail
+from ietf.ipr.models import IprDisclosureBase
 
 class LatestIprDisclosuresFeed(Feed):
     feed_type = Atom1Feed
@@ -18,7 +16,7 @@ class LatestIprDisclosuresFeed(Feed):
     feed_url = "/feed/ipr/"
 
     def items(self):
-        return IprDetail.objects.filter(status__in=[1,3]).order_by('-submitted_date')[:30]
+        return IprDisclosureBase.objects.filter(state__in=('posted','removed')).order_by('-time')[:30]
 
     def item_title(self, item):
         return mark_safe(item.title)
@@ -27,18 +25,16 @@ def item_description(self, item):
         return unicode(item.title)
 
     def item_pubdate(self, item):
-        # this method needs to return a datetime instance, even
-        # though the database has only date, not time 
-        return datetime.datetime.combine(item.submitted_date, datetime.time(0,0,0))
+        return item.time
 
     def item_author_name(self, item):
-        s = item.get_submitter()
-        if s:
-            return s.name
-        return None
+        if item.by:
+            return item.by.name
+        else:
+            return None
 
     def item_author_email(self, item):
-	s = item.get_submitter()
-	if s:
-	    return s.email
-        return None
+        if item.by:
+            return item.by.email_address()
+        else:
+            return None