From 978e2d69ffcdf67ca1a46011fda1d69849942cf7 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Tue, 7 Feb 2012 16:49:37 +0000 Subject: [PATCH] Remember to pass in the substate as initial value in the change state edit view - Legacy-Id: 3906 --- ietf/idrfc/views_edit.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ietf/idrfc/views_edit.py b/ietf/idrfc/views_edit.py index 2300ddafe..0e3260f39 100644 --- a/ietf/idrfc/views_edit.py +++ b/ietf/idrfc/views_edit.py @@ -103,9 +103,11 @@ def change_state(request, name): to_iesg_eval=to_iesg_eval), context_instance=RequestContext(request)) +IESG_SUBSTATE_TAGS = ('point', 'ad-f-up', 'need-rev', 'extpty') + class ChangeStateFormREDESIGN(forms.Form): state = forms.ModelChoiceField(State.objects.filter(type="draft-iesg"), empty_label=None, required=True) - substate = forms.ModelChoiceField(DocTagName.objects.filter(slug__in=('point', 'ad-f-up', 'need-rev', 'extpty')), required=False) + substate = forms.ModelChoiceField(DocTagName.objects.filter(slug__in=IESG_SUBSTATE_TAGS), required=False) comment = forms.CharField(widget=forms.Textarea, required=False) @group_required('Area_Director','Secretariat') @@ -171,7 +173,9 @@ def change_stateREDESIGN(request, name): else: state = doc.get_state("draft-iesg") - form = ChangeStateForm(initial=dict(state=state.pk if state else None)) + t = doc.tags.filter(slug__in=('point', 'ad-f-up', 'need-rev', 'extpty')) + form = ChangeStateForm(initial=dict(state=state.pk if state else None, + substate=t[0].pk if t else None)) state = doc.get_state("draft-iesg") next_states = state.next_states.all() if state else None