Skip to content

Commit 356552d

Browse files
committed
Fixed id_abstracts to include drafts assigned directly to areas, not only individual and WG drafts.
- Legacy-Id: 4620
1 parent a732ebf commit 356552d

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

ietf/group/proxy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class IETFWG(Group):
105105
areagroup__area__status=lambda v: ("parent__state", { 1: "active" }[v]),
106106
start_date__isnull=lambda v: None if v else ("groupevent__changestategroupevent__state__slug", "active"),
107107
),
108-
always_filter=dict(type__in=("wg", "individ")))
108+
always_filter=dict(type__in=("wg", "individ", "area")))
109109

110110
def from_object(self, base):
111111
for f in base._meta.fields:

ietf/idindex/views.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
from ietf.idtracker.templatetags.ietf_filters import clean_whitespace
4242
import re
4343
import sys
44+
from datetime import datetime as Datetime
45+
import pytz
4446

4547
def all_id_txt():
4648
# we need a distinct to prevent the queries below from multiplying the result
@@ -144,7 +146,7 @@ def id_index_txt():
144146

145147
def id_abstracts_txt():
146148
groups = IETFWG.objects.all()
147-
return loader.render_to_string("idindex/id_abstracts.txt", {'groups':groups})
149+
return loader.render_to_string("idindex/id_abstracts.txt", {'groups':groups, 'time':Datetime.now(pytz.UTC).strftime("%Y-%m-%d %H:%M:%S %Z")})
148150

149151
def test_all_id_txt(request):
150152
return HttpResponse(all_id_txt(), mimetype='text/plain')

ietf/templates/idindex/id_abstracts.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
This summary sheet provides a short synopsis of each Internet-Draft
44
available within the "internet-drafts" directory at the shadow
55
sites directory. These drafts are listed alphabetically by working
6-
group acronym and start date.
6+
group acronym and start date. Generated {{date}}
77
{% endblock %}{% block abstract %}
88

99
{{ draft.clean_abstract|indent|indent|safe }}{% endblock %}

0 commit comments

Comments
 (0)