Changed a state name, and renamed some view functions for easier code reading. Removed extra name= parameters from the submit/ urlpatterns.

 - Legacy-Id: 11917

Author: levkowetz

ietf/message/resources.py

@@ -8,7 +8,6 @@
 from ietf import api
 
 from ietf.message.models import Message, SendQueue, MessageAttachment
-
 from ietf.person.resources import PersonResource
 from ietf.group.resources import GroupResource
 from ietf.doc.resources import DocumentResource

ietf/name/fixtures/names.json

@@ -884,7 +884,7 @@
   "desc": ""
  },
  "model": "name.draftsubmissionstatename",
- "pk": "manual-awaiting-draft"
+ "pk": "waiting-for-draft"
 },
 {
  "fields": {

ietf/submit/admin.py

@@ -11,7 +11,7 @@ class SubmissionAdmin(admin.ModelAdmin):
     raw_id_fields = ['group', 'draft']
 
     def status_link(self, instance):
-        url = urlreverse('submit_submission_status_by_hash',
+        url = urlreverse('ietf.submit.views.submission_status',
                          kwargs=dict(submission_id=instance.pk,
                                      access_token=instance.access_token()))
         return '<a href="%s">%s</a>' % (url, instance.state)

ietf/submit/forms.py

@@ -226,9 +226,9 @@ def clean(self):
             self.group = self.deduce_group()
 
             # check existing
-            existing = Submission.objects.filter(name=self.filename, rev=self.revision).exclude(state__in=("posted", "cancel", "manual-awaiting-draft"))
+            existing = Submission.objects.filter(name=self.filename, rev=self.revision).exclude(state__in=("posted", "cancel", "waiting-for-draft"))
             if existing:
-                raise forms.ValidationError(mark_safe('A submission with same name and revision is currently being processed. <a href="%s">Check the status here.</a>' % urlreverse("submit_submission_status", kwargs={ 'submission_id': existing[0].pk })))
+                raise forms.ValidationError(mark_safe('A submission with same name and revision is currently being processed. <a href="%s">Check the status here.</a>' % urlreverse("ietf.submit.views.submission_status", kwargs={ 'submission_id': existing[0].pk })))
 
             # cut-off
             if self.revision == '00' and self.in_first_cut_off:

ietf/submit/mail.py

@@ -3,7 +3,6 @@
 import datetime
 import base64
 import os
-
 import pyzmail
 
 from django.conf import settings
@@ -16,20 +15,19 @@
 from ietf.utils.mail import send_mail, send_mail_message
 from ietf.doc.models import Document
 from ietf.ipr.mail import utc_from_string
-from ietf.mailtrigger.utils import gather_address_lists, \
-    get_base_submission_message_address
 from ietf.person.models import Person
 from ietf.message.models import Message, MessageAttachment
 from ietf.utils.accesstoken import generate_access_token
+from ietf.mailtrigger.utils import gather_address_lists, get_base_submission_message_address
 from ietf.submit.models import SubmissionEmail, Submission
 
 def send_submission_confirmation(request, submission, chair_notice=False):
     subject = 'Confirm submission of I-D %s' % submission.name
     from_email = settings.IDSUBMIT_FROM_EMAIL
     (to_email, cc) = gather_address_lists('sub_confirmation_requested',submission=submission)
 
-    confirm_url = settings.IDTRACKER_BASE_URL + urlreverse('submit_confirm_submission', kwargs=dict(submission_id=submission.pk, auth_token=generate_access_token(submission.auth_key)))
-    status_url = settings.IDTRACKER_BASE_URL + urlreverse('submit_submission_status_by_hash', kwargs=dict(submission_id=submission.pk, access_token=submission.access_token()))
+    confirm_url = settings.IDTRACKER_BASE_URL + urlreverse('ietf.submit.views.confirm_submission', kwargs=dict(submission_id=submission.pk, auth_token=generate_access_token(submission.auth_key)))
+    status_url = settings.IDTRACKER_BASE_URL + urlreverse('ietf.submit.views.submission_status', kwargs=dict(submission_id=submission.pk, access_token=submission.access_token()))
 
     send_mail(request, to_email, from_email, subject, 'submit/confirm_submission.txt', 
               {
@@ -48,7 +46,7 @@ def send_full_url(request, submission):
     subject = 'Full URL for managing submission of draft %s' % submission.name
     from_email = settings.IDSUBMIT_FROM_EMAIL
     (to_email, cc) = gather_address_lists('sub_management_url_requested',submission=submission)
-    url = settings.IDTRACKER_BASE_URL + urlreverse('submit_submission_status_by_hash', kwargs=dict(submission_id=submission.pk, access_token=submission.access_token()))
+    url = settings.IDTRACKER_BASE_URL + urlreverse('ietf.submit.views.submission_status', kwargs=dict(submission_id=submission.pk, access_token=submission.access_token()))
 
     send_mail(request, to_email, from_email, subject, 'submit/full_url.txt', 
               {
@@ -84,7 +82,7 @@ def send_manual_post_request(request, submission, errors):
     (to_email,cc) = gather_address_lists('sub_manual_post_requested',submission=submission)
     send_mail(request, to_email, from_email, subject, 'submit/manual_post_request.txt', {
         'submission': submission,
-        'url': settings.IDTRACKER_BASE_URL + urlreverse('submit_submission_status', kwargs=dict(submission_id=submission.pk)),
+        'url': settings.IDTRACKER_BASE_URL + urlreverse('ietf.submit.views.submission_status', kwargs=dict(submission_id=submission.pk)),
         'errors': errors,
     }, cc=cc)
 
@@ -233,7 +231,7 @@ def add_submission_email(request, remote_ip, name, rev, submission_pk, message,
         # create Submission using the name
         try:
             submission = Submission.objects.create(
-                    state_id="manual-awaiting-draft",
+                    state_id="waiting-for-draft",
                     remote_ip=remote_ip,
                     name=name,
                     rev=rev,

ietf/submit/migrations/0012_auto_20160414_1902.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 from django.db import migrations
@@ -9,8 +9,8 @@ def add_draft_submission_state_name(apps, schema_editor):
         # We can't import the model directly as it may be a newer
         # version than this migration expects. We use the historical version.
         DraftSubmissionStateName = apps.get_model("name", "DraftSubmissionStateName")
-        DraftSubmissionStateName.objects.create(slug="manual-awaiting-draft",
-                                                name="Manual Post Awaiting Draft",
+        DraftSubmissionStateName.objects.create(slug="waiting-for-draft",
+                                                name="Manual Post Awaiting Draft Upload",
                                                 desc="",
                                                 used=True,
                                                 order=8)

ietf/submit/migrations/0014_auto_20160627_1945.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 from django.db import migrations
@@ -10,7 +10,7 @@ def add_next_states(apps, schema_editor):
 
         cancelled = DraftSubmissionStateName.objects.get(slug="cancel")
         posted = DraftSubmissionStateName.objects.get(slug="posted")
-        mad = DraftSubmissionStateName.objects.get(slug="manual-awaiting-draft")
+        mad = DraftSubmissionStateName.objects.get(slug="waiting-for-draft")
 
         mad.next_states.add(cancelled)
         mad.next_states.add(posted)

ietf/submit/tests.py

@@ -98,7 +98,7 @@ def do_submission(self, name, rev, group=None, formats=["txt",]):
         self.assertTrue(os.path.exists(settings.IDSUBMIT_IDNITS_BINARY))
 
         # get
-        url = urlreverse('submit_upload_submission')
+        url = urlreverse('ietf.submit.views.upload_submission')
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
@@ -645,12 +645,12 @@ def test_search_for_submission_and_edit_as_secretariat(self):
         self.do_submission(name, rev)
 
         # search status page
-        r = self.client.get(urlreverse("submit_search_submission"))
+        r = self.client.get(urlreverse("ietf.submit.views.search_submission"))
         self.assertEqual(r.status_code, 200)
         self.assertTrue("submission status" in unicontent(r))
 
         # search
-        r = self.client.post(urlreverse("submit_search_submission"), dict(name=name))
+        r = self.client.post(urlreverse("ietf.submit.views.search_submission"), dict(name=name))
         self.assertEqual(r.status_code, 302)
         unprivileged_status_url = r['Location']
 
@@ -690,7 +690,7 @@ def test_request_full_url(self):
         self.do_submission(name, rev)
 
         submission = Submission.objects.get(name=name)
-        url = urlreverse('submit_submission_status', kwargs=dict(submission_id=submission.pk))
+        url = urlreverse('ietf.submit.views.submission_status', kwargs=dict(submission_id=submission.pk))
 
         # check we got request full URL button
         r = self.client.get(url)
@@ -762,17 +762,17 @@ def test_expire_submissions(self):
         self.assertEqual(s.state_id, "cancel")
 
     def test_help_pages(self):
-        r = self.client.get(urlreverse("submit_note_well"))
+        r = self.client.get(urlreverse("ietf.submit.views.note_well"))
         self.assertEquals(r.status_code, 200)
 
-        r = self.client.get(urlreverse("submit_tool_instructions"))
+        r = self.client.get(urlreverse("ietf.submit.views.tool_instructions"))
         self.assertEquals(r.status_code, 200)
 
     def test_blackout_access(self):
         make_test_data()
 
         # get
-        url = urlreverse('submit_upload_submission')
+        url = urlreverse('ietf.submit.views.upload_submission')
         # set meeting to today so we're in blackout period
         meeting = Meeting.get_current_meeting()
         meeting.date = datetime.datetime.utcnow()
@@ -802,7 +802,7 @@ def submit_bad_file(self, name, formats):
         self.assertTrue(os.path.exists(settings.IDSUBMIT_IDNITS_BINARY))
 
         # get
-        url = urlreverse('submit_upload_submission')
+        url = urlreverse('ietf.submit.views.upload_submission')
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
@@ -850,7 +850,7 @@ class ApprovalsTestCase(TestCase):
     def test_approvals(self):
         make_test_data()
 
-        url = urlreverse('submit_approvals')
+        url = urlreverse('ietf.submit.views.approvals')
         self.client.login(username="marschairman", password="marschairman+password")
 
         Preapproval.objects.create(name="draft-ietf-mars-foo", by=Person.objects.get(user__username="marschairman"))
@@ -881,7 +881,7 @@ def test_approvals(self):
     def test_add_preapproval(self):
         make_test_data()
 
-        url = urlreverse('submit_add_preapproval')
+        url = urlreverse('ietf.submit.views.add_preapproval')
         login_testing_unauthorized(self, "marschairman", url)
 
         # get
@@ -908,7 +908,7 @@ def test_cancel_preapproval(self):
 
         preapproval = Preapproval.objects.create(name="draft-ietf-mars-foo", by=Person.objects.get(user__username="marschairman"))
 
-        url = urlreverse('submit_cancel_preapproval', kwargs=dict(preapproval_id=preapproval.pk))
+        url = urlreverse('ietf.submit.views.cancel_preapproval', kwargs=dict(preapproval_id=preapproval.pk))
         login_testing_unauthorized(self, "marschairman", url)
 
         # get
@@ -927,7 +927,7 @@ class ManualPostsTestCase(TestCase):
     def test_manual_posts(self):
         make_test_data()
 
-        url = urlreverse('submit_manualpost')
+        url = urlreverse('ietf.submit.views.manualpost')
         # Secretariat has access
         self.client.login(username="secretary", password="secretary+password")
 
@@ -949,7 +949,7 @@ def test_manual_posts(self):
         self.assertEqual(len(q('.submissions a:contains("draft-ietf-mars-foo")')), 1)
         self.assertEqual(len(q('.submissions a:contains("draft-ietf-mars-bar")')), 0)
 
-    def test_awaiting_draft(self):
+    def test_waiting_for_draft(self):
         message_string = """To: somebody@ietf.org
 From: joe@test.com
 Date: {}
@@ -970,7 +970,7 @@ def test_awaiting_draft(self):
                                  by = Person.objects.get(name="(System)"),
                                  msgtype = "msgin")
 
-        url = urlreverse('submit_manualpost')
+        url = urlreverse('ietf.submit.views.manualpost')
         # Secretariat has access
         self.client.login(username="secretary", password="secretary+password")
 
@@ -979,7 +979,7 @@ def test_awaiting_draft(self):
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
 
-        self.assertEqual(len(q('.awaiting-draft a:contains("draft-my-new-draft")')), 1)
+        self.assertEqual(len(q('.waiting-for-draft a:contains("draft-my-new-draft")')), 1)
 
         # Same name should raise an error
         with self.assertRaises(Exception):
@@ -993,7 +993,7 @@ def test_awaiting_draft(self):
                                  msgtype = "msgin")
 
         # Cancel this one
-        r = self.client.post(urlreverse("submit_cancel_awaiting_draft_by_hash"), {
+        r = self.client.post(urlreverse("ietf.submit.views.cancel_waiting_for_draft"), {
             "submission_id": submission.pk,
             "access_token": submission.access_token(),
         })
@@ -1002,7 +1002,7 @@ def test_awaiting_draft(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('.awaiting-draft a:contains("draft-my-new-draft")')), 0)
+        self.assertEqual(len(q('.waiting-for-draft a:contains("draft-my-new-draft")')), 0)
 
         # Should now be able to add it again
         submission, submission_email_event = \
@@ -1016,7 +1016,7 @@ def test_awaiting_draft(self):
                                  msgtype = "msgin")
 
 
-    def test_awaiting_draft_with_attachment(self):
+    def test_waiting_for_draft_with_attachment(self):
         frm = "joe@test.com"
 
         message_string = """To: somebody@ietf.org
@@ -1052,7 +1052,7 @@ def test_awaiting_draft_with_attachment(self):
                                  by = Person.objects.get(name="(System)"),
                                  msgtype = "msgin")
 
-        manualpost_page_url = urlreverse('submit_manualpost')
+        manualpost_page_url = urlreverse('ietf.submit.views.manualpost')
         # Secretariat has access
         self.client.login(username="secretary", password="secretary+password")
 
@@ -1135,7 +1135,7 @@ def check_manualpost_page(self, submission, submission_email_event,
                               is_secretariat):
         # get the page listing manual posts
         r, q = self.request_and_parse(the_url)
-        selector = "#awaiting-draft a#add-submission-email{}:contains('Add email')". \
+        selector = "#waiting-for-draft a#add-submission-email{}:contains('Add email')". \
             format(submission.pk, submission_name_fragment)
 
         if is_secretariat:
@@ -1146,7 +1146,7 @@ def check_manualpost_page(self, submission, submission_email_event,
             self.assertEqual(len(q(selector)), 0)
 
         # Find the link for our submission in those awaiting drafts
-        submission_url = self.get_href(q, "#awaiting-draft a#aw{}:contains({})".
+        submission_url = self.get_href(q, "#waiting-for-draft a#aw{}:contains({})".
                                        format(submission.pk, submission_name_fragment))
 
         # Follow the link to the status page for this submission
@@ -1317,7 +1317,7 @@ def do_submission(self, name, rev, group=None, formats=["txt",]):
         # We're not testing the submission process - just the submission status 
 
         # get
-        url = urlreverse('submit_upload_submission')
+        url = urlreverse('ietf.submit.views.upload_submission')
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)

ietf/submit/urls.py

@@ -1,28 +1,29 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import patterns
 
+from ietf.submit import views
 
 urlpatterns = patterns('ietf.submit.views',
-    url(r'^$', 'upload_submission', name='submit_upload_submission'),
-    url(r'^status/$', 'search_submission', name='submit_search_submission'),
-    url(r'^status/(?P<submission_id>\d+)/$', 'submission_status', name='submit_submission_status'),
-    url(r'^status/(?P<submission_id>\d+)/edit/$', 'edit_submission', name='submit_edit_submission'),
-    url(r'^status/(?P<submission_id>\d+)/confirm/(?P<auth_token>[a-f\d]+)/$', 'confirm_submission', name='submit_confirm_submission'),
-    url(r'^status/(?P<submission_id>\d+)/(?P<access_token>[a-f\d]*)/$', 'submission_status', name='submit_submission_status_by_hash'),
-    url(r'^status/(?P<submission_id>\d+)/(?P<access_token>[a-f\d]+)/edit/$', 'edit_submission', name='submit_edit_submission_by_hash'),
-    url(r'^note-well/$', 'note_well', name='submit_note_well'),
-    url(r'^tool-instructions/$', 'tool_instructions', name='submit_tool_instructions'),
+    (r'^$', views.upload_submission),
+    (r'^status/$', views.search_submission),
+    (r'^status/(?P<submission_id>\d+)/$', views.submission_status),
+    (r'^status/(?P<submission_id>\d+)/(?P<access_token>[a-f\d]*)/$', views.submission_status),
+    (r'^status/(?P<submission_id>\d+)/confirm/(?P<auth_token>[a-f\d]+)/$', views.confirm_submission),
+    (r'^status/(?P<submission_id>\d+)/edit/$', views.edit_submission),
+    (r'^status/(?P<submission_id>\d+)/(?P<access_token>[a-f\d]+)/edit/$', views.edit_submission),
+    (r'^note-well/$', views.note_well),
+    (r'^tool-instructions/$', views.tool_instructions),
 
-    url(r'^approvals/$', 'approvals', name='submit_approvals'),
-    url(r'^approvals/addpreapproval/$', 'add_preapproval', name='submit_add_preapproval'),
-    url(r'^approvals/cancelpreapproval/(?P<preapproval_id>[a-f\d]+)/$', 'cancel_preapproval', name='submit_cancel_preapproval'),
+    (r'^approvals/$', views.approvals),
+    (r'^approvals/addpreapproval/$', views.add_preapproval),
+    (r'^approvals/cancelpreapproval/(?P<preapproval_id>[a-f\d]+)/$', views.cancel_preapproval),
 
-    url(r'^manualpost/addemail$', 'add_manualpost_email', name='submit_manualpost_email'),
-    url(r'^manualpost/addemail/(?P<submission_id>\d+)/(?P<access_token>[a-f\d]*)/$', 'add_manualpost_email', name='submit_manualpost_email_by_hash'),
-    url(r'^awaitingdraft/cancel$', 'cancel_awaiting_draft', name='submit_cancel_awaiting_draft_by_hash'),
-    url(r'^manualpost/$', 'manualpost', name='submit_manualpost'),
-    url(r'^manualpost/email/(?P<submission_id>\d+)/(?P<message_id>\d+)/$', 'submission_email', name='submit_submission_email'),
-    url(r'^manualpost/email/(?P<submission_id>\d+)/(?P<message_id>\d+)/(?P<access_token>[a-f\d]*)/$', 'submission_email', name='submit_submission_email_by_hash'),
-    url(r'^manualpost/sendemail/(?P<submission_id>\d+)/$', 'send_email', name='submission_send_email'),
-    url(r'^manualpost/replyemail/(?P<submission_id>\d+)/(?P<message_id>\d+)/$', 'send_email', name='submission_reply_email'),
-    url(r'^manualpost/attachment/(?P<submission_id>\d+)/(?P<message_id>\d+)/(?P<filename>.*)$', 'submission_email_attachment', name='submit_submission_email_attachment'),
+    (r'^manualpost/$', views.manualpost),
+    (r'^manualpost/addemail$', views.add_manualpost_email),
+    (r'^manualpost/addemail/(?P<submission_id>\d+)/(?P<access_token>[a-f\d]*)/$', views.add_manualpost_email),
+    (r'^manualpost/attachment/(?P<submission_id>\d+)/(?P<message_id>\d+)/(?P<filename>.*)$', views.show_submission_email_attachment),
+    (r'^manualpost/cancel$', views.cancel_waiting_for_draft),
+    (r'^manualpost/email/(?P<submission_id>\d+)/(?P<message_id>\d+)/$', views.show_submission_email_message),
+    (r'^manualpost/email/(?P<submission_id>\d+)/(?P<message_id>\d+)/(?P<access_token>[a-f\d]*)/$', views.show_submission_email_message),
+    (r'^manualpost/replyemail/(?P<submission_id>\d+)/(?P<message_id>\d+)/$', views.send_submission_email),
+    (r'^manualpost/sendemail/(?P<submission_id>\d+)/$', views.send_submission_email),
 )