Skip to content

Commit 07382a0

Browse files
committed
Add an entry to the group history when closing a group is being
requested and use that to put a notice on the WG page. - Legacy-Id: 4399
1 parent e2aa218 commit 07382a0

4 files changed

Lines changed: 21 additions & 2 deletions

File tree

ietf/group/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ def __unicode__(self):
8686
("changed_state", "Changed state"),
8787
("added_comment", "Added comment"),
8888
("info_changed", "Changed metadata"),
89+
("requested_close", "Requested closing group"),
8990
]
9091

9192
class GroupEvent(models.Model):

ietf/templates/wginfo/wg_charterREDESIGN.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,14 @@
5555
<tr><td>Area:</td><td>{{ wg.parent.name }} ({{ wg.parent.acronym }})</td></tr>
5656
{% endif %}
5757

58-
<tr><td>State:</td><td>{{ wg.state.name }}</td></tr>
58+
<tr>
59+
<td>State:</td>
60+
<td>{{ wg.state.name }}
61+
{% if requested_close %}
62+
(but in the process of being closed)
63+
{% endif %}
64+
</td>
65+
</tr>
5966

6067
<tr>
6168
<td>Charter:</td>

ietf/wginfo/edit.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,11 @@ def conclude(request, acronym):
251251

252252
email_secretariat(request, wg, "conclude", instructions)
253253

254+
e = GroupEvent(group=wg, by=login)
255+
e.type = "requested_close"
256+
e.desc = "Requested closing group"
257+
e.save()
258+
254259
return redirect('wg_charter', acronym=wg.acronym)
255260
else:
256261
form = ConcludeForm()

ietf/wginfo/views.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,19 @@ def wg_charter(request, acronym):
168168
if settings.USE_DB_REDESIGN_PROXY_CLASSES:
169169
fill_in_charter_info(wg)
170170
actions = []
171+
172+
e = wg.latest_event(type__in=("changed_state", "requested_close",))
173+
requested_close = wg.state_id != "conclude" and e and e.type == "requested_close"
174+
171175
if wg.state_id != "conclude":
172176
actions.append(("Edit WG", urlreverse("wg_edit", kwargs=dict(acronym=wg.acronym))))
173177
actions.append(("Request closing WG", urlreverse("wg_conclude", kwargs=dict(acronym=wg.acronym))))
174178

175179
context = get_wg_menu_context(wg, "charter")
176180
context.update(dict(
177-
actions=actions))
181+
actions=actions,
182+
requested_close=requested_close,
183+
))
178184

179185
return render_to_response('wginfo/wg_charterREDESIGN.html',
180186
context,

0 commit comments

Comments
 (0)