From eed28dbb491e8c8f45d1b3bb011314a75a3a747c Mon Sep 17 00:00:00 2001
From: Ryan Cross <rcross@amsl.com>
Date: Thu, 12 Nov 2015 18:44:28 +0000
Subject: [PATCH] Small fixes to Liaison Tool changes.  Commit ready for merge 
 - Legacy-Id: 10465

---
 ietf/liaisons/feeds.py                              |  6 +++---
 ietf/liaisons/migrations/0008_auto_20151110_1352.py |  2 +-
 ietf/name/fixtures/names.json                       | 10 ++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ietf/liaisons/feeds.py b/ietf/liaisons/feeds.py
index f9434d23b..cbe59f66b 100644
--- a/ietf/liaisons/feeds.py
+++ b/ietf/liaisons/feeds.py
@@ -41,11 +41,11 @@ class LiaisonStatementsFeed(Feed):
                 # wildcards to make it easier to construct a URL that
                 # matches
                 search_string = re.sub(r"[^a-zA-Z1-9]", ".", search)
-                statement = LiaisonStatement.objects.filter(from_name__iregex=search_string).first()
+                statement = LiaisonStatement.objects.filter(from_groups__name__iregex=search_string).first()
                 if not statement:
                     raise FeedDoesNotExist
 
-                name = statement.from_name
+                name = statement.from_groups.first().name
                 obj['filter'] = { 'from_name': name }
                 obj['title'] = u'Liaison Statements from %s' % name
                 return obj
@@ -97,4 +97,4 @@ class LiaisonStatementsFeed(Feed):
         return item.submitted
 
     def item_author_name(self, item):
-        return item.from_name
+        return item.from_groups.first().name
diff --git a/ietf/liaisons/migrations/0008_auto_20151110_1352.py b/ietf/liaisons/migrations/0008_auto_20151110_1352.py
index 02090025f..605af9251 100644
--- a/ietf/liaisons/migrations/0008_auto_20151110_1352.py
+++ b/ietf/liaisons/migrations/0008_auto_20151110_1352.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations
 
 def create_required_tags(apps, schema_editor):
     LiaisonStatement = apps.get_model("liaisons", "LiaisonStatement")
diff --git a/ietf/name/fixtures/names.json b/ietf/name/fixtures/names.json
index 8baaddb78..e270b992f 100644
--- a/ietf/name/fixtures/names.json
+++ b/ietf/name/fixtures/names.json
@@ -1580,6 +1580,16 @@
  "model": "name.liaisonstatementeventtypename",
  "pk": "comment"
 },
+{
+ "fields": {
+  "order": 10,
+  "used": true,
+  "name": "Private Comment",
+  "desc": ""
+ },
+ "model": "name.liaisonstatementeventtypename",
+ "pk": "private_comment"
+},
 {
  "fields": {
   "order": 1,