Skip to content

Commit 1b56a33

Browse files
committed
Fix bugs in abandoning chartering of a proposed/bof/unknown group,
apparently most of the problems are inherited from trunk - Legacy-Id: 5092
1 parent b19f6d8 commit 1b56a33

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

ietf/wgcharter/views.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,17 @@ def change_state(request, name, option=None):
7676
if "-" not in charter_rev:
7777
charter_rev = charter_rev + "-00"
7878
elif option == "abandon":
79-
oldstate = group.state_id
80-
if oldstate in ("proposed", "bof", "unknown"):
79+
oldstate = group.state
80+
if oldstate.slug in ("proposed", "bof", "unknown"):
8181
charter_state = State.objects.get(type="charter", slug="notrev")
8282
#TODO : set an abandoned state and leave some comments here
8383
group.state = GroupStateName.objects.get(slug='abandon')
8484
group.save()
85-
e = ChangeStateGroupEvent(group=wg, type="changed_state")
86-
e.time = wg.time
85+
e = ChangeStateGroupEvent(group=group, type="changed_state")
86+
e.time = group.time
8787
e.by = login
88-
e.state_id = clean["state"].slug
89-
e.desc = "Group state changed to %s from %s" % (clean["state"].name, oldstate)
88+
e.state_id = group.state.slug
89+
e.desc = "Group state changed to %s from %s" % (group.state, oldstate)
9090
e.save()
9191

9292
else:

0 commit comments

Comments
 (0)