From 3942d63733e6df55f0f5b2b78c27056f9af18c3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20A=2E=20S=C3=A1nchez=20L=C3=B3pez?=
 <esanchez@yaco.es>
Date: Thu, 10 Feb 2011 20:01:49 +0000
Subject: [PATCH] Recover confirmation url and fix draft_status template. Fixes
 #591  - Legacy-Id: 2847

---
 ietf/submit/urls.py                     |  1 +
 ietf/submit/views.py                    |  6 ++-
 ietf/templates/submit/draft_status.html | 68 +++++++++++++++----------
 3 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/ietf/submit/urls.py b/ietf/submit/urls.py
index b7de99106..a149ebb2e 100644
--- a/ietf/submit/urls.py
+++ b/ietf/submit/urls.py
@@ -6,6 +6,7 @@ urlpatterns = patterns('ietf.submit.views',
     url(r'^status/$', 'submit_status', name='submit_status'),
     url(r'^status/(?P<submission_id>\d+)/$', 'draft_status', name='draft_status'),
     url(r'^status/(?P<submission_id>\d+)/edit/$', 'draft_edit', name='draft_edit'),
+    url(r'^status/(?P<submission_id>\d+)/confirm/(?P<auth_key>[a-f\d]+)/$', 'draft_confirm', name='draft_confirm'),
     url(r'^status/(?P<submission_id>\d+)/cancel/$', 'draft_cancel', name='draft_cancel'),
 )
 
diff --git a/ietf/submit/views.py b/ietf/submit/views.py
index 3e534a67b..f13ea3c35 100644
--- a/ietf/submit/views.py
+++ b/ietf/submit/views.py
@@ -49,6 +49,8 @@ def draft_status(request, submission_id, message=None):
     status = None
     allow_edit = True
     if detail.status_id != UPLOADED:
+        if detail.status_id == CANCELED:
+            message=('error', 'This submission has been canceled, modification is no longer possible')
         status = detail.status
         allow_edit = None
     if request.method=='POST' and allow_edit:
@@ -67,7 +69,9 @@ def draft_status(request, submission_id, message=None):
                                'validation': validation,
                                'auto_post_form': auto_post_form,
                                'is_valid': is_valid,
-                               'canceled': detail.status_id == CANCELED
+                               'status': status,
+                               'message': message,
+                               'allow_edit': allow_edit,
                               },
                               context_instance=RequestContext(request))
 
diff --git a/ietf/templates/submit/draft_status.html b/ietf/templates/submit/draft_status.html
index fc8c3018f..68cfc78dd 100644
--- a/ietf/templates/submit/draft_status.html
+++ b/ietf/templates/submit/draft_status.html
@@ -68,11 +68,12 @@ function confirmCancelation(){
 
 {% block submit_content %}
 
-{% if canceled %}
-<h2>Submission Canceled</h2>
-<div class="metadata-errors">
-  <p>This submission has been canceled, modification is no longer possible.</p>
-</div>
+{% if status %} 
+<h2>Status of the submission: {{ status.status_value }}</h2> 
+{% endif %} 
+
+{% if message %} 
+<div class="info-message-{{ message.0 }}">{{ message.1 }}</div> 
 {% endif %}
 
 <h2>Check Page</h2>
@@ -143,29 +144,40 @@ returned to the submitter.
 <tr{% if validation.warnings.pages %} class="warning"{% endif %}><th>Pages</th><td>{{ detail.txt_page_count }}<div class="warn_message">{{ validation.warnings.pages }}</div></td></tr>
 <tr{% if validation.warnings.abstract %} class="warning"{% endif %}><th>Abstract</th><td>{{ detail.abstract|linebreaksbr }}<div class="warn_message">{{ validation.warnings.abstract }}</div></td></tr>
 </table>
-{% if not canceled %}
-  <form method="post" action="" name="auto_post_form">
-    <input type="submit" value="Adjust Meta-Data" value="adjust" /> (Leads to manual post by the Secretariat)
-  </form>
-  {% if is_valid %}
-  <h2>Please edit the following meta-data before proceeding to Auto-Post</h2>
-  <p>
-  If you are one of the authors of this document, then please click the button with your name on it to automatically fill in the submitter information as requested below. Otherwise, please manually enter your information.
-  </p>
-  <form method="post" action="">
-  {{ auto_post_form.get_author_buttons|safe }}
-  <table class="metadata-table">
-  {{ auto_post_form }}
-  </table>
-  <input type="submit" value="Post" name="autopost" />
-  </form>
-  {% endif %}
-  
-  <h2>Cancel submission</h2>
-  <p>
-    <input type="button" onclick="confirmCancelation();" value="Cancel Submission" /><br>
-     This submission will be canceled, and its uploaded document(s) permanently deleted.
-  </p>
+
+{% if allow_edit %} 
+<form method="post" action="" name="auto_post_form"> 
+<input type="submit" value="Adjust Meta-Data" value="adjust" /> (Leads to manual post by the Secretariat) 
+</form> 
+{% if is_valid %} 
+<h2>Please edit the following meta-data before proceeding to Auto-Post</h2> 
+<p> 
+If you are one of the authors of this document, then please click the button with your name on it to automatically fill in the submitter information as requested below. Otherwise, please manually enter your information. 
+</p> 
+<form method="post" action=""> 
+{{ auto_post_form.get_author_buttons|safe }} 
+<table class="metadata-table"> 
+{{ auto_post_form }} 
+</table> 
+<input type="submit" value="Post" name="autopost" /> 
+</form> 
+{% endif %} 
+
+<h2>Cancel submission</h2>
+<p>
+  <input type="button" onclick="confirmCancelation();" value="Cancel Submission" /><br>
+   This submission will be canceled, and its uploaded document(s) permanently deleted.
+</p>
+{% else %}
+{% if validation.submitter %} 
+<h3>Submitter information</h3> 
+<table class="metadata-table"> 
+<tr><th>First name</th><td>{{ validation.submitter.first_name }}</td></tr> 
+<tr><th>Last name</th><td>{{ validation.submitter.last_name }}</td></tr> 
+<tr><th>Email address</th><td>{{ validation.submitter.email_address|default:validation.submitter.email.1 }}</td></tr> 
+</table> 
+{% endif %} 
+ 
 {% endif %}
 
 <p>