Skip to content

Commit 7e501c9

Browse files
committed
Fix bug in feed.
- Legacy-Id: 4263
1 parent 6d0d014 commit 7e501c9

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

ietf/urls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
'iesg-agenda': IESGAgenda,
2626
'last-call': InLastCall,
2727
'comments': DocumentComments,
28-
'wg': GroupEvents,
28+
'wgchanges': GroupEvents,
2929
'ipr': LatestIprDisclosures,
3030
'liaison': Liaisons,
3131
'wg-proceedings' : LatestWgProceedingsActivity

ietf/wgcharter/feeds.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@
77
from django.utils.feedgenerator import Atom1Feed
88
from django.core.exceptions import ObjectDoesNotExist
99
from django.core.urlresolvers import reverse as urlreverse
10-
from ietf.utils.history import find_history_active_at
10+
from django.template.defaultfilters import truncatewords_html
1111

12+
from ietf.idtracker.templatetags.ietf_filters import format_textarea, fill
13+
from ietf.wgcharter.utils import *
14+
from ietf.utils.history import find_history_active_at
1215
from ietf.group.models import Group
16+
from ietf.idrfc.views_doc import _get_html
1317

1418
def _get_history(wg, versions=None):
1519
results = []
@@ -46,11 +50,11 @@ def _get_history(wg, versions=None):
4650

4751
# convert plain dates to datetimes (required for sorting)
4852
for x in results:
49-
if not isinstance(x['date'], datetime):
53+
if not isinstance(x['date'], datetime.datetime):
5054
if x['date']:
51-
x['date'] = datetime.combine(x['date'], time(0,0,0))
55+
x['date'] = datetime.datetime.combine(x['date'], datetime.time(0,0,0))
5256
else:
53-
x['date'] = datetime(1970,1,1)
57+
x['date'] = datetime.datetime(1970,1,1)
5458

5559
results.sort(key=lambda x: x['date'])
5660
results.reverse()
@@ -93,12 +97,12 @@ def items(self, obj):
9397
h['rev'] = dh.rev
9498
h['charter'] = _get_html(
9599
str(dh.name)+"-"+str(dh.rev)+",html",
96-
os.path.join(dh.get_file_path(), dh.name+"-"+dh.rev+".txt"))
100+
os.path.join(dh.get_file_path(), dh.name+"-"+dh.rev+".txt"), False)
97101
else:
98102
h['rev'] = obj.charter.rev
99103
h['charter'] = _get_html(
100104
"charter-ietf-"+str(obj.acronym)+"-"+str(obj.charter.rev)+",html",
101-
os.path.join(obj.charter.get_file_path(), "charter-ietf-"+obj.acronym+"-"+obj.charter.rev+".txt"))
105+
os.path.join(obj.charter.get_file_path(), "charter-ietf-"+obj.acronym+"-"+obj.charter.rev+".txt"), False)
102106
return history
103107

104108
def item_link(self, obj):

0 commit comments

Comments
 (0)