diff --git a/ietf/secr/areas/tests.py b/ietf/secr/areas/tests.py index e61a1fc6d..5854fbc14 100644 --- a/ietf/secr/areas/tests.py +++ b/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 @@ 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) diff --git a/ietf/secr/areas/urls.py b/ietf/secr/areas/urls.py index 2cdb34ed4..7603403d2 100644 --- a/ietf/secr/areas/urls.py +++ b/ietf/secr/areas/urls.py @@ -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[A-Za-z0-9.-]+)/$', views.view, name='areas_view'), - url(r'^(?P[A-Za-z0-9.-]+)/edit/$', views.edit, name='areas_edit'), - url(r'^(?P[A-Za-z0-9.-]+)/people/$', views.people, name='areas_people'), - url(r'^(?P[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[A-Za-z0-9.-]+)/$', views.view), + url(r'^(?P[A-Za-z0-9.-]+)/edit/$', views.edit), + url(r'^(?P[A-Za-z0-9.-]+)/people/$', views.people), + url(r'^(?P[A-Za-z0-9.-]+)/people/modify/$', views.modify), ] diff --git a/ietf/secr/areas/views.py b/ietf/secr/areas/views.py index f67bf62eb..7bbc8eaee 100644 --- a/ietf/secr/areas/views.py +++ b/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): diff --git a/ietf/secr/templates/areas/list.html b/ietf/secr/templates/areas/list.html index 67e2e03ee..ed5ec4511 100644 --- a/ietf/secr/templates/areas/list.html +++ b/ietf/secr/templates/areas/list.html @@ -25,7 +25,7 @@ {% for item in results %} - {{ item.name }} + {{ item.name }} {{ item.acronym }} {{ item.state }} diff --git a/ietf/secr/templates/drafts/view.html b/ietf/secr/templates/drafts/view.html index 6d9f0a5e6..4af5a7ded 100644 --- a/ietf/secr/templates/drafts/view.html +++ b/ietf/secr/templates/drafts/view.html @@ -21,7 +21,7 @@

Draft - View

- + diff --git a/ietf/secr/templates/groups/view.html b/ietf/secr/templates/groups/view.html index b3d816e34..748f5a3df 100644 --- a/ietf/secr/templates/groups/view.html +++ b/ietf/secr/templates/groups/view.html @@ -33,7 +33,7 @@ {% endcomment %} diff --git a/ietf/secr/templates/main.html b/ietf/secr/templates/main.html index ae78494cd..5de76403d 100644 --- a/ietf/secr/templates/main.html +++ b/ietf/secr/templates/main.html @@ -17,7 +17,7 @@
Document Name:{{ draft.title }}
Area:{% if draft.group.parent %}{{ draft.group.parent }}{% endif %}
Area:{% if draft.group.parent %}{{ draft.group.parent }}{% endif %}
Group:{% if draft.group %}{{ draft.group.acronym }}{% endif %}
Area Director:{{ draft.ad }}
Shepherd:{% if draft.shepherd %}{{ draft.shepherd.person }} <{{ draft.shepherd.address }}>{% else %}None{% endif %}
Primary Area: {% if not group.parent %}(No Data){% else %} - {{ group.parent }} + {{ group.parent }} {% endif %}

IDs and WGs Process

  • Drafts

    • -
  • Areas

    • +
  • Areas

  • Groups

  • Rolodex

  • Roles

    • diff --git a/ietf/secr/templates/rolodex/view.html b/ietf/secr/templates/rolodex/view.html index e27bde6bb..381f45ef9 100644 --- a/ietf/secr/templates/rolodex/view.html +++ b/ietf/secr/templates/rolodex/view.html @@ -44,7 +44,7 @@     		{{ role.name }} {% if role.group.type.slug == "area" %} - {{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %} + {{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %} {% else %} {{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %} {% endif %}