|
7 | 7 | from django.utils.feedgenerator import Atom1Feed |
8 | 8 | from django.core.exceptions import ObjectDoesNotExist |
9 | 9 | 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 |
11 | 11 |
|
| 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 |
12 | 15 | from ietf.group.models import Group |
| 16 | +from ietf.idrfc.views_doc import _get_html |
13 | 17 |
|
14 | 18 | def _get_history(wg, versions=None): |
15 | 19 | results = [] |
@@ -46,11 +50,11 @@ def _get_history(wg, versions=None): |
46 | 50 |
|
47 | 51 | # convert plain dates to datetimes (required for sorting) |
48 | 52 | for x in results: |
49 | | - if not isinstance(x['date'], datetime): |
| 53 | + if not isinstance(x['date'], datetime.datetime): |
50 | 54 | 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)) |
52 | 56 | else: |
53 | | - x['date'] = datetime(1970,1,1) |
| 57 | + x['date'] = datetime.datetime(1970,1,1) |
54 | 58 |
|
55 | 59 | results.sort(key=lambda x: x['date']) |
56 | 60 | results.reverse() |
@@ -93,12 +97,12 @@ def items(self, obj): |
93 | 97 | h['rev'] = dh.rev |
94 | 98 | h['charter'] = _get_html( |
95 | 99 | 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) |
97 | 101 | else: |
98 | 102 | h['rev'] = obj.charter.rev |
99 | 103 | h['charter'] = _get_html( |
100 | 104 | "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) |
102 | 106 | return history |
103 | 107 |
|
104 | 108 | def item_link(self, obj): |
|
0 commit comments