From 9766ab39e54cd657b2da30bc24dae6ea56dd1ebd Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Sat, 23 Jul 2011 12:01:36 +0000
Subject: [PATCH] Some IPR admin tweaks.  Provide a __unicode__ method and show
 a contact even if multiple have been set for an IPR declaration.  -
 Legacy-Id: 3197

---
 ietf/ipr/admin.py  | 2 ++
 ietf/ipr/models.py | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/ietf/ipr/admin.py b/ietf/ipr/admin.py
index 4b732a28e..4f66fb079 100644
--- a/ietf/ipr/admin.py
+++ b/ietf/ipr/admin.py
@@ -7,6 +7,8 @@ class IprContactAdmin(admin.ModelAdmin):
 admin.site.register(IprContact, IprContactAdmin)
 
 class IprDetailAdmin(admin.ModelAdmin):
+    list_display = ['title', 'submitted_date', 'docs', ]
+    search_fields = ['title', 'legal_name', ]
     pass
 admin.site.register(IprDetail, IprDetailAdmin)
 
diff --git a/ietf/ipr/models.py b/ietf/ipr/models.py
index 456f49af4..c895c453a 100644
--- a/ietf/ipr/models.py
+++ b/ietf/ipr/models.py
@@ -114,6 +114,8 @@ class IprDetail(models.Model):
 
     def __str__(self):
 	return self.title
+    def __unicode__(self):
+        return self.title.decode("latin-1", 'replace')
     def docs(self):
         return list(self.drafts.all()) + list(self.rfcs.all())
     @models.permalink
@@ -124,6 +126,8 @@ class IprDetail(models.Model):
 	    return self.contact.get(contact_type=3)
 	except IprContact.DoesNotExist:
 	    return None
+        except IprContact.MultipleObjectsReturned:
+            return self.contact.filter(contact_type=3)[0]
     class Meta:
         db_table = 'ipr_detail'