Skip to content

Commit eed28db

Browse files
committed
Small fixes to Liaison Tool changes. Commit ready for merge
- Legacy-Id: 10465
1 parent 1ea5dcf commit eed28db

3 files changed

Lines changed: 14 additions & 4 deletions

File tree

ietf/liaisons/feeds.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ def get_object(self, request, kind, search=None):
4141
# wildcards to make it easier to construct a URL that
4242
# matches
4343
search_string = re.sub(r"[^a-zA-Z1-9]", ".", search)
44-
statement = LiaisonStatement.objects.filter(from_name__iregex=search_string).first()
44+
statement = LiaisonStatement.objects.filter(from_groups__name__iregex=search_string).first()
4545
if not statement:
4646
raise FeedDoesNotExist
4747

48-
name = statement.from_name
48+
name = statement.from_groups.first().name
4949
obj['filter'] = { 'from_name': name }
5050
obj['title'] = u'Liaison Statements from %s' % name
5151
return obj
@@ -97,4 +97,4 @@ def item_pubdate(self, item):
9797
return item.submitted
9898

9999
def item_author_name(self, item):
100-
return item.from_name
100+
return item.from_groups.first().name

ietf/liaisons/migrations/0008_auto_20151110_1352.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import unicode_literals
33

4-
from django.db import models, migrations
4+
from django.db import migrations
55

66
def create_required_tags(apps, schema_editor):
77
LiaisonStatement = apps.get_model("liaisons", "LiaisonStatement")

ietf/name/fixtures/names.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1580,6 +1580,16 @@
15801580
"model": "name.liaisonstatementeventtypename",
15811581
"pk": "comment"
15821582
},
1583+
{
1584+
"fields": {
1585+
"order": 10,
1586+
"used": true,
1587+
"name": "Private Comment",
1588+
"desc": ""
1589+
},
1590+
"model": "name.liaisonstatementeventtypename",
1591+
"pk": "private_comment"
1592+
},
15831593
{
15841594
"fields": {
15851595
"order": 1,

0 commit comments

Comments
 (0)