Skip to content

Commit 6ca9b6f

Browse files
author
Michael Lee
committed
Render the receipt page with proper contents
- Legacy-Id: 635
1 parent 9dad4b8 commit 6ca9b6f

2 files changed

Lines changed: 43 additions & 2 deletions

File tree

ietf/mailinglists/views.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,9 @@ def done(self, request, form_list):
133133
list.status = 1
134134
list.save()
135135
approver_email = PersonOrOrgInfo.objects.get(pk=approver).email()
136+
approver_name = PersonOrOrgInfo.objects.get(pk=approver)
136137
send_mail_subj(request, [ approver_email ], None, 'mailinglists/nwg_wizard_subject.txt', 'mailinglists/nwg_wizard_done_email.txt', {'add_edit': add_edit, 'old': old, 'list': list, 'forms': self.clean_forms})
137-
return render_to_response( 'mailinglists/nwg_wizard_done.html', {'forms': self.clean_forms}, context_instance=RequestContext(request) )
138+
return render_to_response( 'mailinglists/nwg_wizard_done.html', {'approver': approver_name, 'add_edit': add_edit, 'old': old, 'list': list, 'forms': self.clean_forms}, context_instance=RequestContext(request) )
138139

139140
def non_wg_wizard(request):
140141
wiz = NonWgWizard([ NonWgStep1 ])
Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,45 @@
11
{% extends "mailinglists/nwg_wizard_base.html" %}
22

33
{% block nwgcontent %}
4-
Your mail has been sent, blah blah blah.
4+
<a href="/mailinglists/nonwg_lists/"><b>View Current list</b></a><br>
5+
</p>
6+
<p>
7+
Your request to {% ifequal add_edit "edit" %}edit{% else %}{% ifequal add_edit "add" %}add{% else %}delete{% endifequal %}{% endifequal %} the entry for the Non-WG Mailing List that is described below has been sent to the following Area Director for approval:</p>
8+
<p>
9+
<b>{{ approver|escape }}</b>
10+
</p>
11+
<pre>
12+
{% if old %}
13+
Current Entry:
14+
15+
Submitter's Name: {{ old.s_name }}
16+
Submitter's Email Address: {{ old.s_email }}
17+
List Name: {{ old.list_name }}
18+
URL or Email Address of Mailing List: {{ old.list_url }}
19+
URL to Subscribe: {{ old.subscribe_url }}
20+
Other Info. to Subscribe: {{ old.subscribe_other }}
21+
Administrator(s)' Email Address(es): {{ old.admin }}
22+
Purpose: {{ old.purpose }}
23+
Area: {{ old.area }}
24+
25+
Revised Entry:
26+
{% endif %}
27+
Submitter's Name: {% ifequal add_edit "delete" %}{{ list.ds_name }}{% else %}{{ list.s_name }}{% endifequal %}
28+
Submitter's Email Address: {% ifequal add_edit "delete" %}{{ list.ds_name }}{% else %}{{ list.s_email }}{% endifequal %}
29+
Mailing List Name: {{ list.list_name }}
30+
URL or Email Address of Mailing List: {{ list.list_url }}
31+
URL to Subscribe: {{ list.subscribe_url }}
32+
Other Info. to Subscribe: {{ list.subscribe_other }}
33+
Administrator(s)' Email Address(es): {{ list.admin }}
34+
Purpose: {{ list.purpose }}
35+
Area: {{ list.area }}
36+
{% ifequal add_edit "delete" %}
37+
Message from submitter:
38+
{{ list.msg_to_ad }}
39+
{% endifequal %}
40+
</pre>
41+
<p>
42+
Approving Area Director: {{ approver|escape }}
43+
</p>
44+
545
{% endblock %}

0 commit comments

Comments
 (0)