Port IPR module to new schema, remove some cruft

 - Legacy-Id: 6774

Author: OleLaursen

ietf/doc/proxy.py

@@ -714,7 +714,6 @@ def all(self):
 
     @property
     def ipr(self):
-        from ietf.ipr.models import IprDraftProxy
         return IprDraftProxy.objects.filter(doc_alias__document=self.pk)
 
     class Meta:
@@ -888,7 +887,6 @@ def filename(self):
 
     @property
     def ipr(self):
-        from ietf.ipr.models import IprDraftProxy
         return IprDraftProxy.objects.filter(doc_alias=self.pk)
 
     class Meta:
@@ -996,3 +994,47 @@ class Meta:
         proxy = True
 
 
+
+
+# proxy stuff for ipr
+from ietf.ipr.models import IprDocAlias
+
+class IprDraftProxy(IprDocAlias):
+    objects = TranslatingManager(dict(document="doc_alias__name"))
+
+    # document = models.ForeignKey(InternetDraft, db_column='id_document_tag', "ipr")
+    # document = models.ForeignKey(Rfc, db_column='rfc_number', related_name="ipr")
+    @property
+    def document(self):
+        from ietf.doc.proxy import DraftLikeDocAlias
+        return DraftLikeDocAlias.objects.get(pk=self.doc_alias_id)
+
+    #revision = models.CharField(max_length=2)
+    @property
+    def revision(self):
+        return self.rev
+
+    class Meta:
+        proxy = True
+
+IprDraft = IprDraftProxy
+
+class IprRfcProxy(IprDocAlias):
+    objects = TranslatingManager(dict(document=lambda v: ("doc_alias__name", "rfc%s" % v)))
+
+    # document = models.ForeignKey(InternetDraft, db_column='id_document_tag', "ipr")
+    # document = models.ForeignKey(Rfc, db_column='rfc_number', related_name="ipr")
+    @property
+    def document(self):
+        from ietf.doc.proxy import DraftLikeDocAlias
+        return DraftLikeDocAlias.objects.get(pk=self.doc_alias_id)
+
+    #revision = models.CharField(max_length=2)
+    @property
+    def revision(self):
+        return self.rev
+
+    class Meta:
+        proxy = True
+
+IprRfc = IprRfcProxy

ietf/ipr/__init__.py

@@ -1,2 +1 @@
-# Copyright The IETF Trust 2007, All Rights Reserved
 

ietf/ipr/admin.py

@@ -8,8 +8,20 @@ class IprContactAdmin(admin.ModelAdmin):
 admin.site.register(IprContact, IprContactAdmin)
 
 class IprDetailAdmin(admin.ModelAdmin):
-    list_display = ['title', 'submitted_date', 'docs', ]
-    search_fields = ['title', 'legal_name', ]
+    list_display = ['title', 'submitted_date', 'docs', 'status']
+    search_fields = ['title', 'legal_name']
+
+    def docs(self, ipr):
+        res = []
+        for iprdocalias in IprDocAlias.objects.filter(ipr=ipr).order_by("id").select_related("doc_alias"):
+            if iprdocalias.doc_alias.name.startswith("rfc"):
+                n = iprdocalias.doc_alias.name.upper()
+            elif iprdocalias.rev:
+                n = iprdocalias.doc_alias.name + iprdocalias.rev
+            else:
+                n = iprdocalias.doc_alias.name
+            res.append(n)
+        return u", ".join(res)
 admin.site.register(IprDetail, IprDetailAdmin)
 
 class IprLicensingAdmin(admin.ModelAdmin):

ietf/ipr/feeds.py

@@ -22,7 +22,7 @@ def item_pubdate(self, item):
         # though the database has only date, not time 
 	return datetime.combine(item.submitted_date, time(0,0,0))
     def item_author_name(self, item):
-	s = item.get_submitter()
+        s = item.get_submitter()
         if s:
             return s.name
         return None

ietf/ipr/models.py

@@ -1,11 +1,9 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
 from django.db import models
-from django.conf import settings
-from ietf.utils.lazy import reverse_lazy
 
-# ------------------------------------------------------------------------
-# Models
+from ietf.doc.models import DocAlias
+
 
 LICENSE_CHOICES = (
     (1, 'a) No License Required for Implementers.'),
@@ -42,20 +40,14 @@ class IprSelecttype(models.Model):
     type_id = models.AutoField(primary_key=True)
     is_pending = models.IntegerField(unique=True, db_column="selecttype")
     type_display = models.CharField(blank=True, max_length=15)
-    def __str__(self):
+    def __unicode__(self):
 	return self.type_display
-    class Meta:
-        if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
-            db_table = 'ipr_selecttype'
 
 class IprLicensing(models.Model):
     licensing_option = models.AutoField(primary_key=True)
     value = models.CharField(max_length=255, db_column='licensing_option_value')
-    def __str__(self):
+    def __unicode__(self):
 	return self.value;
-    class Meta:
-        if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
-            db_table = 'ipr_licensing'
 
 
 class IprDetail(models.Model):
@@ -115,17 +107,8 @@ class IprDetail(models.Model):
     submitted_date = models.DateField(blank=True)
     update_notified_date = models.DateField(null=True, blank=True)
 
-    def __str__(self):
-	return self.title
     def __unicode__(self):
-        if settings.USE_DB_REDESIGN_PROXY_CLASSES:
-            # the latin-1 decode doesn't seem necessary anymore
-            return self.title
-        return self.title.decode("latin-1", 'replace')
-    def docs(self):
-        if settings.USE_DB_REDESIGN_PROXY_CLASSES:
-            return list(IprDraftProxy.objects.filter(ipr=self))
-        return list(self.drafts.all()) + list(self.rfcs.all())
+        return self.title
     @models.permalink
     def get_absolute_url(self):
         return ('ietf.ipr.views.show', [str(self.ipr_id)])
@@ -173,8 +156,6 @@ class IprUpdate(models.Model):
     processed = models.IntegerField(null=True, blank=True)
 
 
-from ietf.doc.models import DocAlias
-
 class IprDocAlias(models.Model):
     ipr = models.ForeignKey(IprDetail, related_name='documents')
     doc_alias = models.ForeignKey(DocAlias)
@@ -189,46 +170,3 @@ class Meta:
         verbose_name = "IPR document alias"
         verbose_name_plural = "IPR document aliases"
 
-# proxy stuff
-
-from ietf.utils.proxy import TranslatingManager
-
-class IprDraftProxy(IprDocAlias):
-    objects = TranslatingManager(dict(document="doc_alias__name"))
-
-    # document = models.ForeignKey(InternetDraft, db_column='id_document_tag', "ipr")
-    # document = models.ForeignKey(Rfc, db_column='rfc_number', related_name="ipr")
-    @property
-    def document(self):
-        from ietf.doc.proxy import DraftLikeDocAlias
-        return DraftLikeDocAlias.objects.get(pk=self.doc_alias_id)
-
-    #revision = models.CharField(max_length=2)
-    @property
-    def revision(self):
-        return self.rev
-
-    class Meta:
-        proxy = True
-
-IprDraft = IprDraftProxy
-
-class IprRfcProxy(IprDocAlias):
-    objects = TranslatingManager(dict(document=lambda v: ("doc_alias__name", "rfc%s" % v)))
-
-    # document = models.ForeignKey(InternetDraft, db_column='id_document_tag', "ipr")
-    # document = models.ForeignKey(Rfc, db_column='rfc_number', related_name="ipr")
-    @property
-    def document(self):
-        from ietf.doc.proxy import DraftLikeDocAlias
-        return DraftLikeDocAlias.objects.get(pk=self.doc_alias_id)
-
-    #revision = models.CharField(max_length=2)
-    @property
-    def revision(self):
-        return self.rev
-
-    class Meta:
-        proxy = True
-
-IprRfc = IprRfcProxy