Skip to content

Commit b4988b2

Browse files
committed
Make IESG discusses use doc/search/status_columns.html with a quick hack to break dependency on ietfworkflows, remove now unused idrfc/status_columns.html, remove unused iesg/agenda_documents_row_status.html
- Legacy-Id: 6220
1 parent 2e29298 commit b4988b2

4 files changed

Lines changed: 5 additions & 56 deletions

File tree

ietf/iesg/views.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,10 @@ def discusses(request):
620620
doc = IdWrapper(draft=d)
621621

622622
if doc.in_ietf_process() and doc.ietf_process.has_active_iesg_ballot():
623+
# quick hack - to be removed when the proxy code is removed
624+
doc.underlying = doc.underlying_document()
625+
doc.underlying.milestones = d.groupmilestone_set.filter(state="active").order_by("time").select_related("group")
626+
623627
res.append(doc)
624628

625629
return direct_to_template(request, 'iesg/discusses.html', {'docs':res})

ietf/templates/idrfc/status_columns.html

Lines changed: 0 additions & 51 deletions
This file was deleted.

ietf/templates/iesg/agenda_documents_row_status.html

Lines changed: 0 additions & 4 deletions
This file was deleted.

ietf/templates/iesg/discusses.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ <h1>IESG Discuss Positions</h1>
5858
{% for doc in docs %}
5959
<tr class="discuss_row {% cycle oddrow,evenrow %} {% if user|in_group:"Area_Director" %}{% if doc|my_position:user|equal:"Discuss" %}discuss_byme{% else %}discuss_notbyme{% endif %} {% ifequal user.get_profile.person|lower doc.ad_name|lower %}discuss_forme{%else%}discuss_notforme{%endifequal%}{% endif %}">
6060
<td class="doc">{{ doc.displayname_with_link|safe }}</td>
61-
{% include "idrfc/status_columns.html" %}
61+
{% with doc.underlying as doc %}{% include "doc/search/status_columns.html" %}{% endwith %}
6262
<td class="ad">{{ doc.ad_name|default:"" }}</td>
6363
<td>
6464
{% for po in doc.ietf_process.iesg_ballot.get_discuss|dictsort:"is_old_ad" %}

0 commit comments

Comments
 (0)