diff --git a/ietf/templates/wgcharter/change_state.html b/ietf/templates/wgcharter/change_state.html index ece85a6d9..135a2d9fe 100644 --- a/ietf/templates/wgcharter/change_state.html +++ b/ietf/templates/wgcharter/change_state.html @@ -48,7 +48,7 @@ form.change-state .actions { {{ field.errors }} - {% if field.name == "charter_state" and not option == "initcharter" %} + {% if field.name == "charter_state" and chartering_type == "rechartering" %} diff --git a/ietf/wgcharter/views.py b/ietf/wgcharter/views.py index 43a7a05d9..2b60be16a 100644 --- a/ietf/wgcharter/views.py +++ b/ietf/wgcharter/views.py @@ -16,7 +16,7 @@ from ietf.utils.mail import send_mail_text, send_mail_preformatted from ietf.ietfauth.decorators import has_role, role_required from ietf.iesg.models import TelechatDate from ietf.doc.models import * -from ietf.doc.utils import create_ballot_if_not_open, close_open_ballots +from ietf.doc.utils import * from ietf.name.models import * from ietf.person.models import * from ietf.group.models import * @@ -175,6 +175,7 @@ def change_state(request, name, option=None): prev_charter_state=prev_charter_state, title=title, initial_review=initial_review, + chartering_type=get_chartering_type(charter), messages=simplejson.dumps(messages), states_for_ballot_wo_extern=simplejson.dumps(list(states_for_ballot_wo_extern)), ),