Render the receipt page with proper contents

- Legacy-Id: 635
This commit is contained in:
Michael Lee 2007-06-25 17:41:40 +00:00
parent 9dad4b8a75
commit 6ca9b6f451
2 changed files with 43 additions and 2 deletions

View file

@ -133,8 +133,9 @@ class NonWgWizard(wizard.Wizard):
list.status = 1
list.save()
approver_email = PersonOrOrgInfo.objects.get(pk=approver).email()
approver_name = PersonOrOrgInfo.objects.get(pk=approver)
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})
return render_to_response( 'mailinglists/nwg_wizard_done.html', {'forms': self.clean_forms}, context_instance=RequestContext(request) )
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) )
def non_wg_wizard(request):
wiz = NonWgWizard([ NonWgStep1 ])

View file

@ -1,5 +1,45 @@
{% extends "mailinglists/nwg_wizard_base.html" %}
{% block nwgcontent %}
Your mail has been sent, blah blah blah.
<a href="/mailinglists/nonwg_lists/"><b>View Current list</b></a><br>
</p>
<p>
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>
<p>
<b>{{ approver|escape }}</b>
</p>
<pre>
{% if old %}
Current Entry:
Submitter's Name: {{ old.s_name }}
Submitter's Email Address: {{ old.s_email }}
List Name: {{ old.list_name }}
URL or Email Address of Mailing List: {{ old.list_url }}
URL to Subscribe: {{ old.subscribe_url }}
Other Info. to Subscribe: {{ old.subscribe_other }}
Administrator(s)' Email Address(es): {{ old.admin }}
Purpose: {{ old.purpose }}
Area: {{ old.area }}
Revised Entry:
{% endif %}
Submitter's Name: {% ifequal add_edit "delete" %}{{ list.ds_name }}{% else %}{{ list.s_name }}{% endifequal %}
Submitter's Email Address: {% ifequal add_edit "delete" %}{{ list.ds_name }}{% else %}{{ list.s_email }}{% endifequal %}
Mailing List Name: {{ list.list_name }}
URL or Email Address of Mailing List: {{ list.list_url }}
URL to Subscribe: {{ list.subscribe_url }}
Other Info. to Subscribe: {{ list.subscribe_other }}
Administrator(s)' Email Address(es): {{ list.admin }}
Purpose: {{ list.purpose }}
Area: {{ list.area }}
{% ifequal add_edit "delete" %}
Message from submitter:
{{ list.msg_to_ad }}
{% endifequal %}
</pre>
<p>
Approving Area Director: {{ approver|escape }}
</p>
{% endblock %}