Eliminated a few url() name= parameters.

 - Legacy-Id: 12834

Author: levkowetz

ietf/secr/areas/tests.py

@@ -19,7 +19,7 @@ class SecrAreasTestCase(TestCase):
     def test_main(self):
         "Main Test"
         make_test_data()
-        url = reverse('areas')
+        url = reverse('ietf.secr.areas.views.list_areas')
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
@@ -29,7 +29,7 @@ def test_view(self):
         make_test_data()
         augment_data()
         areas = Group.objects.filter(type='area',state='active')
-        url = reverse('areas_view', kwargs={'name':areas[0].acronym})
+        url = reverse('ietf.secr.areas.views.view', kwargs={'name':areas[0].acronym})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)

ietf/secr/areas/urls.py

@@ -3,12 +3,12 @@
 from ietf.utils.urls import url
 
 urlpatterns = [
-    url(r'^$', views.list_areas, name='areas'),
-    url(r'^add/$', views.add, name='areas_add'),
-    url(r'^getemails', views.getemails, name='areas_emails'),
-    url(r'^getpeople', views.getpeople, name='areas_getpeople'),
-    url(r'^(?P<name>[A-Za-z0-9.-]+)/$', views.view, name='areas_view'),
-    url(r'^(?P<name>[A-Za-z0-9.-]+)/edit/$', views.edit, name='areas_edit'),
-    url(r'^(?P<name>[A-Za-z0-9.-]+)/people/$', views.people, name='areas_people'),
-    url(r'^(?P<name>[A-Za-z0-9.-]+)/people/modify/$', views.modify, name='areas_modify'),
+    url(r'^$', views.list_areas),
+    url(r'^add/$', views.add),
+    url(r'^getemails', views.getemails),
+    url(r'^getpeople', views.getpeople),
+    url(r'^(?P<name>[A-Za-z0-9.-]+)/$', views.view),
+    url(r'^(?P<name>[A-Za-z0-9.-]+)/edit/$', views.edit),
+    url(r'^(?P<name>[A-Za-z0-9.-]+)/people/$', views.people),
+    url(r'^(?P<name>[A-Za-z0-9.-]+)/people/modify/$', views.modify),
 ]

ietf/secr/areas/views.py

@@ -144,9 +144,9 @@ def edit(request, name):
                                               time=new_area.time)
 
                 messages.success(request, 'The Area entry was changed successfully')
-                return redirect('areas_view', name=name)
+                return redirect('ietf.secr.areas.views.view', name=name)
         else:
-            return redirect('areas_view', name=name)
+            return redirect('ietf.secr.areas.views.view', name=name)
     else:
         form = AreaForm(instance=area)
         awp_formset = AWPFormSet(instance=area)
@@ -215,7 +215,7 @@ def people(request, name):
                 Role.objects.create(name_id='pre-ad',group=area,email=email,person=person)
 
                 messages.success(request, 'New Area Director added successfully!')
-                return redirect('areas_view', name=name)
+                return redirect('ietf.secr.areas.views.view', name=name)
     else:
         form = AreaDirectorForm()
 
@@ -279,7 +279,7 @@ def modify(request, name):
 
             messages.success(request, 'Voting rights have been granted successfully!')
 
-        return redirect('areas_view', name=name)
+        return redirect('ietf.secr.areas.views.view', name=name)
 
 @role_required('Secretariat')
 def view(request, name):

ietf/secr/templates/areas/list.html

@@ -25,7 +25,7 @@ <h2>Areas <span class="unlocked"><a href="add/" class="addlink">Add</a></span></
       <tbody>
 	{% for item in results %}
 	   <tr class="{% cycle 'row1' 'row2' %} {{ item.state|lower }}">
-	     <td><a href="{% url "areas_view" name=item.acronym %}">{{ item.name }}</a></td>
+	     <td><a href="{% url "ietf.secr.areas.views.view" name=item.acronym %}">{{ item.name }}</a></td>
              <td>{{ item.acronym }}</td>
              <td>{{ item.state }}</td>
 	   </tr>

ietf/secr/templates/drafts/view.html

@@ -21,7 +21,7 @@
     <h2>Draft - View</h2>
       <table class="full-width">
         <tr><td>Document Name:</td><td>{{ draft.title }}</td></tr>
-        <tr><td>Area:</td><td>{% if draft.group.parent %}<a href="{% url "areas_view" name=draft.group.parent.acronym %}">{{ draft.group.parent }}{% endif %}</td></tr>
+        <tr><td>Area:</td><td>{% if draft.group.parent %}<a href="{% url "ietf.secr.areas.views.view" name=draft.group.parent.acronym %}">{{ draft.group.parent }}{% endif %}</td></tr>
         <tr><td>Group:</td><td>{% if draft.group %}<a href="{% url "groups_view" acronym=draft.group.acronym %}">{{ draft.group.acronym }}{% endif %}</td></tr>
         <tr><td>Area Director:</td><td>{{ draft.ad }}</td></tr>
         <tr><td>Shepherd:</td><td>{% if draft.shepherd %}{{ draft.shepherd.person }} &lt;{{ draft.shepherd.address }}&gt;{% else %}None{% endif %}</td></tr>

ietf/secr/templates/groups/view.html

@@ -33,7 +33,7 @@ <h2>Groups - View</h2>
         {% endcomment %}
         <tr><td>Primary Area:</td>
             <td>{% if not group.parent %}(No Data){% else %}
-                  <a href="{% url "areas_view" name=group.parent.acronym %}">{{ group.parent }}</a>
+                  <a href="{% url "ietf.secr.areas.views.view" name=group.parent.acronym %}">{{ group.parent }}</a>
                 {% endif %}
             </td>
         </tr>

ietf/secr/templates/main.html

@@ -17,7 +17,7 @@ <h3>IESG</h3>
    <td>
      <h3>IDs and WGs Process</h3>
        <li> <a href="{% url "drafts" %}"><b>Drafts</b></a></li><br>
-       <li> <a href="{% url "areas" %}"><b>Areas</b></a></li><br>
+       <li> <a href="{% url "ietf.secr.areas.views.list_areas" %}"><b>Areas</b></a></li><br>
        <li> <a href="{% url "groups" %}"><b>Groups</b></a></li><br>
        <li> <a href="{% url "rolodex" %}"><b>Rolodex</b></a></li><br>
        <li> <a href="{% url "roles" %}"><b>Roles</b></a></li><br>

ietf/secr/templates/rolodex/view.html

@@ -44,7 +44,7 @@ <h2><b>Roles</b></h2>
                 <td>{{ role.name }} </td>
                 <td>
                   {% if role.group.type.slug == "area" %}
-                      <a href="{% url "areas_view" name=role.group.acronym %}">{{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %}</a>
+                      <a href="{% url "ietf.secr.areas.views.view" name=role.group.acronym %}">{{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %}</a>
                   {% else %}
                     <a href="{% url "groups_view" acronym=role.group.acronym %}">{{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %}</a>
                   {% endif %}