Replaced another bunch of explicit url names with dotted-path to the view function.

 - Legacy-Id: 12849

Author: levkowetz

ietf/doc/urls.py

@@ -50,7 +50,7 @@
     url(r'^in-last-call/$', views_search.drafts_in_last_call, name="drafts_in_last_call"),
     url(r'^ad/(?P<name>[\w.-]+)/$(?u)', views_search.docs_for_ad, name="docs_for_ad"),
     url(r'^ad2/(?P<name>[\w.-]+)/$(?u)', RedirectView.as_view(url='/doc/ad/%(name)s/', permanent=True)),
-    url(r'^rfc-status-changes/$', views_status_change.rfc_status_changes, name='rfc_status_changes'),
+    url(r'^rfc-status-changes/$', views_status_change.rfc_status_changes, name='ietf.doc.views_status_change.rfc_status_changes'),
     url(r'^start-rfc-status-change/(?:%(name)s/)?$' % settings.URL_REGEXPS, views_status_change.start_rfc_status_change, name='start_rfc_status_change'),
     url(r'^iesg/(?P<last_call_only>[A-Za-z0-9.-]+/)?$', views_search.drafts_in_iesg_process, name="drafts_in_iesg_process"),
     url(r'^email-aliases/$', views_doc.email_aliases),

ietf/secr/drafts/tests_views.py

@@ -5,6 +5,8 @@
 from django.conf import settings
 from django.core.urlresolvers import reverse as urlreverse
 
+import debug                            # pyflakes:ignore
+
 from ietf.doc.models import State
 from ietf.person.models import Person
 from ietf.submit.models import Preapproval
@@ -50,7 +52,7 @@ def test_abstract(self):
 
     def test_add(self):
         draft = make_test_data()
-        url = urlreverse('drafts_add')
+        url = urlreverse('ietf.secr.drafts.views.add')
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
@@ -79,7 +81,7 @@ def test_approvals(self):
         make_test_data()
         Preapproval.objects.create(name='draft-dummy',
             by=Person.objects.get(name="(System)"))
-        url = urlreverse('drafts_approvals')
+        url = urlreverse('ietf.secr.drafts.views.approvals')
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
@@ -132,26 +134,26 @@ def test_makerfc(self):
 
     def test_search(self):
         draft = make_test_data()
-        url = urlreverse('drafts')
+        url = urlreverse('ietf.secr.drafts.views.search')
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
 
         post = dict(filename='draft',state=1,submit='submit')
-        response = self.client.post(url,post)
+        response = self.client.post(url, post)
         self.assertEqual(response.status_code, 200)
         self.assertTrue(draft.name in response.content)
 
     def test_update(self):
         draft = make_test_data()
-        url = urlreverse('drafts_update', kwargs={'id':draft.name})
+        url = urlreverse('ietf.secr.drafts.views.update', kwargs={'id':draft.name})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
 
     def test_view(self):
         draft = make_test_data()
-        url = urlreverse('drafts_view', kwargs={'id':draft.name})
+        url = urlreverse('ietf.secr.drafts.views.view', kwargs={'id':draft.name})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)

ietf/secr/drafts/urls.py

@@ -3,12 +3,12 @@
 from ietf.utils.urls import url
 
 urlpatterns = [
-    url(r'^$', views.search, name='drafts'),
-    url(r'^add/$', views.add, name='drafts_add'),
-    url(r'^approvals/$', views.approvals, name='drafts_approvals'),
+    url(r'^$', views.search),
+    url(r'^add/$', views.add),
+    url(r'^approvals/$', views.approvals),
     url(r'^dates/$', views.dates, name='drafts_dates'),
     url(r'^nudge-report/$', views.nudge_report, name='drafts_nudge_report'),
-    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/$', views.view, name='drafts_view'),
+    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/$', views.view),
     url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/abstract/$', views.abstract, name='drafts_abstract'),
     url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/announce/$', views.announce, name='drafts_announce'),
     url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/authors/$', views.authors, name='drafts_authors'),
@@ -21,6 +21,6 @@
     url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/replace/$', views.replace, name='drafts_replace'),
     url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/resurrect/$', views.resurrect, name='drafts_resurrect'),
     url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/revision/$', views.revision, name='drafts_revision'),
-    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/update/$', views.update, name='drafts_update'),
+    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/update/$', views.update),
     url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/withdraw/$', views.withdraw, name='drafts_withdraw'),
 ]

ietf/secr/drafts/views.py

@@ -518,7 +518,7 @@ def announce(request, id):
                            content_type='Multipart/Mixed; Boundary="NextPart"')
 
     messages.success(request, 'Announcement scheduled successfully!')
-    return redirect('drafts_view', id=id)
+    return redirect('ietf.secr.drafts.views.view', id=id)
 
 @role_required('Secretariat')
 def approvals(request):
@@ -568,7 +568,7 @@ def authors(request, id):
                 del request.session['action']
                 return redirect('drafts_announce', id=id)
 
-            return redirect('drafts_view', id=id)
+            return redirect('ietf.secr.drafts.views.view', id=id)
 
         if form.is_valid():
             author = form.cleaned_data['email']
@@ -605,7 +605,7 @@ def confirm(request, id):
             # TODO do cancel functions from session (ie remove uploaded files?)
             # clear session data
             clear_non_auth(request.session)
-            return redirect('drafts_view', id=id)
+            return redirect('ietf.secr.drafts.views.view', id=id)
 
         action = request.session['action']
         if action == 'revision':
@@ -627,7 +627,7 @@ def confirm(request, id):
         clear_non_auth(request.session)
 
         messages.success(request, '%s action performed successfully!' % action)
-        return redirect('drafts_view', id=id)
+        return redirect('ietf.secr.drafts.views.view', id=id)
 
     details = get_action_details(draft, request.session) 
     email = request.session.get('email','')
@@ -681,7 +681,7 @@ def edit(request, id):
     if request.method == 'POST':
         button_text = request.POST.get('submit', '')
         if button_text == 'Cancel':
-            return redirect('drafts_view', id=id)
+            return redirect('ietf.secr.drafts.views.view', id=id)
 
         form = EditModelForm(request.POST, instance=draft)
         if form.is_valid():
@@ -696,7 +696,7 @@ def edit(request, id):
 
                 messages.success(request, 'Draft modified successfully!')
 
-            return redirect('drafts_view', id=id)
+            return redirect('ietf.secr.drafts.views.view', id=id)
         else:
             #assert False, form.errors
             pass
@@ -724,7 +724,7 @@ def email(request, id):
         if button_text == 'Cancel':
             # clear session data
             clear_non_auth(request.session)
-            return redirect('drafts_view', id=id)
+            return redirect('ietf.secr.drafts.views.view', id=id)
 
         form = EmailForm(request.POST)
         if form.is_valid():
@@ -768,7 +768,7 @@ def extend(request, id):
     if request.method == 'POST':
         button_text = request.POST.get('submit', '')
         if button_text == 'Cancel':
-            return redirect('drafts_view', id=id)
+            return redirect('ietf.secr.drafts.views.view', id=id)
 
         form = ExtendForm(request.POST)
         if form.is_valid():
@@ -803,13 +803,13 @@ def makerfc(request, id):
     # raise error if draft intended standard is empty
     if not draft.intended_std_level:
         messages.error(request, 'ERROR: intended RFC status is not set')
-        return redirect('drafts_view', id=id)
+        return redirect('ietf.secr.drafts.views.view', id=id)
 
     ObsFormset = formset_factory(RfcObsoletesForm, extra=15, max_num=15)
     if request.method == 'POST':
         button_text = request.POST.get('submit', '')
         if button_text == 'Cancel':
-            return redirect('drafts_view', id=id)
+            return redirect('ietf.secr.drafts.views.view', id=id)
 
         form = RfcModelForm(request.POST, instance=draft)
         obs_formset = ObsFormset(request.POST, prefix='obs')
@@ -846,7 +846,7 @@ def makerfc(request, id):
             rfc.save_with_history([e])
 
             messages.success(request, 'RFC created successfully!')
-            return redirect('drafts_view', id=id)
+            return redirect('ietf.secr.drafts.views.view', id=id)
         else:
             # assert False, (form.errors, obs_formset.errors)
             pass      
@@ -888,7 +888,7 @@ def replace(request, id):
     if request.method == 'POST':
         button_text = request.POST.get('submit', '')
         if button_text == 'Cancel':
-            return redirect('drafts_view', id=id)
+            return redirect('ietf.secr.drafts.views.view', id=id)
 
         form = ReplaceForm(request.POST, draft=draft)
         if form.is_valid():
@@ -927,7 +927,7 @@ def revision(request, id):
     if request.method == 'POST':
         button_text = request.POST.get('submit', '')
         if button_text == 'Cancel':
-            return redirect('drafts_view', id=id)
+            return redirect('ietf.secr.drafts.views.view', id=id)
 
         upload_form = UploadForm(request.POST, request.FILES, draft=draft)
         form = RevisionModelForm(request.POST, instance=draft)
@@ -1015,7 +1015,7 @@ def search(request):
 
             # if there's just one result go straight to view
             if len(results) == 1:
-                return redirect('drafts_view', id=results[0].name)
+                return redirect('ietf.secr.drafts.views.view', id=results[0].name)
     else:
         active_state = State.objects.get(type='draft',slug='active')
         form = SearchForm(initial={'state':active_state.pk})
@@ -1039,7 +1039,7 @@ def update(request, id):
     if request.method == 'POST':
         button_text = request.POST.get('submit', '')
         if button_text == 'Cancel':
-            return redirect('drafts_view', id=id)
+            return redirect('ietf.secr.drafts.views.view', id=id)
 
         upload_form = UploadForm(request.POST, request.FILES, draft=draft)
         form = RevisionModelForm(request.POST, instance=draft)
@@ -1139,7 +1139,7 @@ def withdraw(request, id):
     if request.method == 'POST':
         button_text = request.POST.get('submit', '')
         if button_text == 'Cancel':
-            return redirect('drafts_view', id=id)
+            return redirect('ietf.secr.drafts.views.view', id=id)
 
         form = WithdrawForm(request.POST)
         if form.is_valid():

ietf/secr/groups/urls.py

@@ -6,14 +6,14 @@
 urlpatterns = [
     url(r'^$', views.search, name='groups'),
     url(r'^add/$', views.add, name='groups_add'),
-    url(r'^blue-dot-report/$', views.blue_dot, name='groups_blue_dot'),
+    url(r'^blue-dot-report/$', views.blue_dot),
     url(r'^search/$', views.search, name='groups_search'),
     #(r'^ajax/get_ads/$', views.get_ads),
     url(r'^%(acronym)s/$' % settings.URL_REGEXPS, views.view, name='groups_view'),
     url(r'^%(acronym)s/delete/(?P<id>\d{1,6})/$' % settings.URL_REGEXPS, views.delete_role, name='groups_delete_role'),
     url(r'^%(acronym)s/charter/$' % settings.URL_REGEXPS, views.charter, name='groups_charter'),
     url(r'^%(acronym)s/edit/$' % settings.URL_REGEXPS, views.edit, name='groups_edit'),
-    url(r'^%(acronym)s/gm/$' % settings.URL_REGEXPS, views.view_gm, name='groups_view_gm'),
-    url(r'^%(acronym)s/gm/edit/$' % settings.URL_REGEXPS, views.edit_gm, name='groups_edit_gm'),
+    url(r'^%(acronym)s/gm/$' % settings.URL_REGEXPS, views.view_gm),
+    url(r'^%(acronym)s/gm/edit/$' % settings.URL_REGEXPS, views.edit_gm),
     url(r'^%(acronym)s/people/$' % settings.URL_REGEXPS, views.people, name='groups_people'),
 ]

ietf/secr/meetings/tests.py

@@ -49,15 +49,15 @@ def tearDown(self):
 
     def test_main(self):
         "Main Test"
-        url = reverse('meetings')
+        url = reverse('ietf.secr.meetings.views.main')
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
 
     def test_view(self):
         "View Test"
         meeting = make_meeting_test_data()
-        url = reverse('meetings_view', kwargs={'meeting_id':meeting.number})
+        url = reverse('ietf.secr.meetings.views.view', kwargs={'meeting_id':meeting.number})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
@@ -69,7 +69,7 @@ def test_add_meeting(self):
         meeting = make_meeting_test_data()
         number = int(meeting.number) + 1
         count = Meeting.objects.count()
-        url = reverse('meetings_add')
+        url = reverse('ietf.secr.meetings.views.add')
         post_data = dict(number=number,city='Toronto',date='2014-07-20',country='CA',
                          time_zone='America/New_York',venue_name='Hilton',
                          venue_addr='100 First Ave',
@@ -92,7 +92,7 @@ def test_edit_meeting(self):
                                type_id='ietf',
                                date=datetime.datetime(2014,7,20),
                            )
-        url = reverse('meetings_edit_meeting',kwargs={'meeting_id':1})
+        url = reverse('ietf.secr.meetings.views.edit_meeting',kwargs={'meeting_id':1})
         post_data = dict(number='1',date='2014-07-20',city='Toronto',
                          idsubmit_cutoff_day_offset_00=13,
                          idsubmit_cutoff_day_offset_01=20,
@@ -113,7 +113,7 @@ def test_blue_sheets_upload(self):
         meeting = make_meeting_test_data()
         os.makedirs(os.path.join(self.proceedings_dir,str(meeting.number),'bluesheets'))
 
-        url = reverse('meetings_blue_sheet',kwargs={'meeting_id':meeting.number})
+        url = reverse('ietf.secr.meetings.views.blue_sheet',kwargs={'meeting_id':meeting.number})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
@@ -130,7 +130,7 @@ def test_blue_sheets_upload(self):
 
     def test_blue_sheets_generate(self):
         meeting = make_meeting_test_data()
-        url = reverse('meetings_blue_sheet_generate',kwargs={'meeting_id':meeting.number})
+        url = reverse('ietf.secr.meetings.views.blue_sheet_generate',kwargs={'meeting_id':meeting.number})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.post(url)
         self.assertEqual(response.status_code, 302)
@@ -139,7 +139,7 @@ def test_blue_sheets_generate(self):
     def test_notifications(self):
         "Test Notifications"
         meeting = make_meeting_test_data()
-        url = reverse('meetings_notifications',kwargs={'meeting_id':42})
+        url = reverse('ietf.secr.meetings.views.notifications',kwargs={'meeting_id':42})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
@@ -172,14 +172,14 @@ def test_notifications(self):
 
     def test_meetings_select(self):
         make_meeting_test_data()
-        url = reverse('meetings_select',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
+        url = reverse('ietf.secr.meetings.views.select',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
 
     def test_meetings_rooms(self):
         meeting = make_meeting_test_data()
-        url = reverse('meetings_rooms',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
+        url = reverse('ietf.secr.meetings.views.rooms',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
@@ -205,7 +205,7 @@ def test_meetings_rooms(self):
 
     def test_meetings_times(self):
         make_meeting_test_data()
-        url = reverse('meetings_times',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
+        url = reverse('ietf.secr.meetings.views.times',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
@@ -215,7 +215,7 @@ def test_meetings_times_delete(self):
         qs = TimeSlot.objects.filter(meeting=meeting,type='session')
         before = qs.count()
         expected_deletion_count = qs.filter(time=qs.first().time).count() 
-        url = reverse('meetings_times_delete',kwargs={
+        url = reverse('ietf.secr.meetings.views.times_delete',kwargs={
             'meeting_id':42,
             'schedule_name':'test-agenda',
             'time':qs.first().time.strftime("%Y:%m:%d:%H:%M")
@@ -246,14 +246,14 @@ def test_meetings_times_edit(self):
 
     def test_meetings_nonsession(self):
         make_meeting_test_data()
-        url = reverse('meetings_non_session',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
+        url = reverse('ietf.secr.meetings.views.non_session',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
 
     def test_meetings_select_group(self):
         make_meeting_test_data()
-        url = reverse('meetings_select_group',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
+        url = reverse('ietf.secr.meetings.views.select_group',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)