Skip to content

Commit

Permalink
Small fixes to Liaison Tool changes. Commit ready for merge
Browse files Browse the repository at this point in the history
 - Legacy-Id: 10465
  • Loading branch information
rpcross committed Nov 12, 2015
1 parent 1ea5dcf commit eed28db
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
6 changes: 3 additions & 3 deletions ietf/liaisons/feeds.py
Expand Up @@ -41,11 +41,11 @@ def get_object(self, request, kind, search=None):
# 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
Expand Down Expand Up @@ -97,4 +97,4 @@ def item_pubdate(self, item):
return item.submitted

def item_author_name(self, item):
return item.from_name
return item.from_groups.first().name
2 changes: 1 addition & 1 deletion 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")
Expand Down
10 changes: 10 additions & 0 deletions ietf/name/fixtures/names.json
Expand Up @@ -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,
Expand Down

0 comments on commit eed28db

Please sign in to comment.