Skip to content

Commit 5a3cccc

Browse files
committed
Fix subtle is_chair bug and construct group_documents_txt state names
directly from state instead of using search headings - Legacy-Id: 6113
1 parent 3f9327e commit 5a3cccc

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

ietf/wginfo/views.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,11 @@ def group_documents_txt(request, acronym):
238238

239239
docs, meta, docs_related, meta_related = search_for_group_documents(group)
240240

241+
for d in docs:
242+
d.prefix = d.get_state().name
243+
241244
for d in docs_related:
242-
d.search_heading = u"Related %s" % d.search_heading
245+
d.prefix = u"Related %s" % d.get_state().name
243246

244247
rows = []
245248
for d in itertools.chain(docs, docs_related):
@@ -249,7 +252,7 @@ def group_documents_txt(request, acronym):
249252
else:
250253
name = "%s-%s" % (d.name, d.rev)
251254

252-
rows.append(u"\t".join((d.search_heading.replace("Internet-Draft", ""), name, clean_whitespace(d.title))))
255+
rows.append(u"\t".join((d.prefix, name, clean_whitespace(d.title))))
253256

254257
return HttpResponse(u"\n".join(rows), mimetype='text/plain; charset=UTF-8')
255258

@@ -269,7 +272,7 @@ def group_charter(request, acronym):
269272
if group.state_id in ("active", "dormant"):
270273
actions.append((u"Request closing %s" % group.type.name, urlreverse("wg_conclude", kwargs=dict(acronym=group.acronym))))
271274

272-
is_chair = request.user.is_authenticated() and group.role_set.filter(name="chair", person__user=request.user),
275+
is_chair = request.user.is_authenticated() and group.role_set.filter(name="chair", person__user=request.user)
273276

274277
return render_to_response('wginfo/group_charter.html',
275278
construct_group_menu_context(request, group, "charter", {

0 commit comments

Comments
 (0)