altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 5 Packages Projects Releases Wiki Activity

Eliminated a few url() name= parameters.

Browse source 
- Legacy-Id: 12834
This commit is contained in:
Henrik Levkowetz 2017-02-13 21:39:11 +00:00
parent dd7b3eb71a
commit d4967c6413
8 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/secr/areas/tests.py
View file

@ -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 @@ class SecrAreasTestCase(TestCase):
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)

16
ietf/secr/areas/urls.py
View file

@ -3,12 +3,12 @@ from ietf.secr.areas import views
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),
]

8
ietf/secr/areas/views.py
View file

@ -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):

2
ietf/secr/templates/areas/list.html
View file

@ -25,7 +25,7 @@
<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>

2
ietf/secr/templates/drafts/view.html
View file

@ -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>

2
ietf/secr/templates/groups/view.html
View file

@ -33,7 +33,7 @@
{% 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>

2
ietf/secr/templates/main.html
View file

@ -17,7 +17,7 @@
<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>

2
ietf/secr/templates/rolodex/view.html
View file

@ -44,7 +44,7 @@
<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 %}