diff --git a/ietf/doc/views_charter.py b/ietf/doc/views_charter.py index 708c3da30..ef9d4556e 100644 --- a/ietf/doc/views_charter.py +++ b/ietf/doc/views_charter.py @@ -32,6 +32,7 @@ from ietf.utils.history import find_history_active_at from ietf.utils.mail import send_mail_preformatted from ietf.utils.textupload import get_cleaned_text_file_content from ietf.group.mails import email_admin_re_charter +from ietf.group.views import fill_in_charter_info class ChangeStateForm(forms.Form): charter_state = forms.ModelChoiceField(State.objects.filter(used=True, type="charter"), label="Charter state", empty_label=None, required=False) @@ -446,6 +447,8 @@ def submit(request, name, option=None): except IOError: pass form = UploadForm(initial=init) + fill_in_charter_info(group) + return render(request, 'doc/charter/submit.html', { 'form': form, 'next_rev': next_rev, diff --git a/ietf/templates/doc/charter/submit.html b/ietf/templates/doc/charter/submit.html index d46356394..422fdb703 100644 --- a/ietf/templates/doc/charter/submit.html +++ b/ietf/templates/doc/charter/submit.html @@ -10,7 +10,75 @@ {% block content %} {% origin %} -

Charter submission
{{ group.acronym }} {{ group.type.name }}

+

Charter submission

+ + + + + + + + + + + + + + + + + + {% if group.parent and group.parent.type_id == "area" %} + + + {% else %} + + {% endif %} + + + + + + + + + {% for slug, label, roles in group.personnel %} + + {% if forloop.first %} + + {% else %} + + {% endif %} + + + + {% endfor %} + + + {% if group.list_email %} + + + + + + + + + {% endif %} +
{{ group.type.name }}Name{{ group.name }}
Acronym{{ group.acronym }}
{{ group.parent.type.name }}{{ group.parent.name }} ({{ group.parent.acronym }})
State + {{ group.state.name }} + {% if requested_close %} +
In the process of being closed
+ {% endif %} +
Personnel{{ label }} + + + {% for r in roles %} + + {{ r.person.plain_name }} +
+ {% endfor %} +
Mailing listAddress{{ group.list_email|urlize }}
To subscribe{{ group.list_subscribe|urlize }}
Archive{{ group.list_archive|urlize }}

The text will be submitted as {{ name }}-{{ next_rev }}.