Renamed some files under ietf/group/ which contained views but didn't have 'views' in the name.

 - Legacy-Id: 11190

Author: levkowetz

ietf/group/tests.py

@@ -68,8 +68,8 @@ def test_group_document_dependency_dotfile(self):
         make_test_data()
         for group in Group.objects.filter(Q(type="wg") | Q(type="rg")):
             client = Client(Accept='text/plain')
-            for url in [ urlreverse("ietf.group.info.dependencies",kwargs=dict(acronym=group.acronym,output_type="dot")),
-                         urlreverse("ietf.group.info.dependencies",kwargs=dict(acronym=group.acronym,group_type=group.type_id,output_type="dot")),
+            for url in [ urlreverse("ietf.group.views.dependencies",kwargs=dict(acronym=group.acronym,output_type="dot")),
+                         urlreverse("ietf.group.views.dependencies",kwargs=dict(acronym=group.acronym,group_type=group.type_id,output_type="dot")),
                        ]:
                 r = client.get(url)
                 self.assertTrue(r.status_code == 200, "Failed to receive "
@@ -81,8 +81,8 @@ def test_group_document_dependency_pdffile(self):
         make_test_data()
         for group in Group.objects.filter(Q(type="wg") | Q(type="rg")):
             client = Client(Accept='application/pdf')
-            for url in [ urlreverse("ietf.group.info.dependencies",kwargs=dict(acronym=group.acronym,output_type="pdf")),
-                         urlreverse("ietf.group.info.dependencies",kwargs=dict(acronym=group.acronym,group_type=group.type_id,output_type="pdf")),
+            for url in [ urlreverse("ietf.group.views.dependencies",kwargs=dict(acronym=group.acronym,output_type="pdf")),
+                         urlreverse("ietf.group.views.dependencies",kwargs=dict(acronym=group.acronym,group_type=group.type_id,output_type="pdf")),
                        ]:
                 r = client.get(url)
                 self.assertTrue(r.status_code == 200, "Failed to receive "
@@ -94,8 +94,8 @@ def test_group_document_dependency_svgfile(self):
         make_test_data()
         for group in Group.objects.filter(Q(type="wg") | Q(type="rg")):
             client = Client(Accept='image/svg+xml')
-            for url in [ urlreverse("ietf.group.info.dependencies",kwargs=dict(acronym=group.acronym,output_type="svg")),
-                         urlreverse("ietf.group.info.dependencies",kwargs=dict(acronym=group.acronym,group_type=group.type_id,output_type="svg")),
+            for url in [ urlreverse("ietf.group.views.dependencies",kwargs=dict(acronym=group.acronym,output_type="svg")),
+                         urlreverse("ietf.group.views.dependencies",kwargs=dict(acronym=group.acronym,group_type=group.type_id,output_type="svg")),
                        ]:
                 r = client.get(url)
                 self.assertTrue(r.status_code == 200, "Failed to receive "
@@ -141,7 +141,7 @@ def test_group_with_mailarch(self):
         group = GroupFactory()
         group.list_archive = 'https://mailarchive.ietf.org/arch/browse/%s/'%group.acronym
         group.save()
-        url = urlreverse("ietf.group.info.derived_archives",kwargs=dict(acronym=group.acronym))
+        url = urlreverse("ietf.group.views.derived_archives",kwargs=dict(acronym=group.acronym))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
@@ -153,7 +153,7 @@ def test_group_without_mailarch(self):
         group = GroupFactory()
         group.list_archive = 'https://alienarchive.example.com'
         group.save()
-        url = urlreverse("ietf.group.info.derived_archives",kwargs=dict(acronym=group.acronym))
+        url = urlreverse("ietf.group.views.derived_archives",kwargs=dict(acronym=group.acronym))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)

ietf/group/tests_info.py

@@ -3,15 +3,15 @@
 from django.conf.urls import patterns, include
 
 urlpatterns = patterns('',
-    (r'^$', 'ietf.group.info.active_groups'), 
-    (r'^groupmenu.json', 'ietf.group.ajax.group_menu_data', None, "group_menu_data"),
-    (r'^(?P<acronym>[a-z0-9]+).json$', 'ietf.group.ajax.group_json'),
-    (r'^chartering/$', 'ietf.group.info.chartering_groups'),
-    (r'^chartering/create/(?P<group_type>(wg|rg))/$', 'ietf.group.edit.edit', {'action': "charter"}, "group_create"),
-    (r'^concluded/$', 'ietf.group.info.concluded_groups'),
-    (r'^email-aliases/$', 'ietf.group.info.email_aliases'),
-    (r'^all-status/$', 'ietf.group.info.all_status'),
-    (r'^(?P<acronym>[a-zA-Z0-9-._]+)/$', 'ietf.group.info.group_home', None, "group_home"),
+    (r'^$', 'ietf.group.views.active_groups'), 
+    (r'^groupmenu.json', 'ietf.group.views_ajax.group_menu_data', None, "group_menu_data"),
+    (r'^(?P<acronym>[a-z0-9]+).json$', 'ietf.group.views_ajax.group_json'),
+    (r'^chartering/$', 'ietf.group.views.chartering_groups'),
+    (r'^chartering/create/(?P<group_type>(wg|rg))/$', 'ietf.group.views_edit.edit', {'action': "charter"}, "group_create"),
+    (r'^concluded/$', 'ietf.group.views.concluded_groups'),
+    (r'^email-aliases/$', 'ietf.group.views.email_aliases'),
+    (r'^all-status/$', 'ietf.group.views.all_status'),
+    (r'^(?P<acronym>[a-zA-Z0-9-._]+)/$', 'ietf.group.views.group_home', None, "group_home"),
     (r'^(?P<acronym>[a-zA-Z0-9-._]+)/', include('ietf.group.urls_info_details')),
 )
 

ietf/group/urls.py

@@ -3,21 +3,21 @@
 from django.conf.urls import patterns, include
 from django.views.generic import RedirectView
 
-from ietf.group import info, edit
+from ietf.group import views, views_edit
 
 urlpatterns = patterns('',
-    (r'^$', info.active_groups), 
+    (r'^$', views.active_groups), 
     (r'^summary.txt', RedirectView.as_view(url='/wg/1wg-summary.txt')),
     (r'^summary-by-area.txt', RedirectView.as_view(url='/wg/1wg-summary.txt')),
     (r'^summary-by-acronym.txt', RedirectView.as_view(url='/wg/1wg-summary-by-acronym.txt')),
-    (r'^1wg-summary.txt', info.wg_summary_area),
-    (r'^1wg-summary-by-acronym.txt', info.wg_summary_acronym),
-    (r'^1wg-charters.txt', info.wg_charters),
-    (r'^1wg-charters-by-acronym.txt', info.wg_charters_by_acronym),
+    (r'^1wg-summary.txt', views.wg_summary_area),
+    (r'^1wg-summary-by-acronym.txt', views.wg_summary_acronym),
+    (r'^1wg-charters.txt', views.wg_charters),
+    (r'^1wg-charters-by-acronym.txt', views.wg_charters_by_acronym),
     (r'^chartering/$', RedirectView.as_view(url='/group/chartering/')),
     (r'^chartering/create/$', RedirectView.as_view(url='/group/chartering/create/%(group_type)s/')),
-    (r'^bofs/$', info.bofs),
-    (r'^email-aliases/$', 'ietf.group.info.email_aliases'),
-    (r'^bofs/create/$', edit.edit, {'action': "create"}, "bof_create"),
+    (r'^bofs/$', views.bofs),
+    (r'^email-aliases/$', 'ietf.group.views.email_aliases'),
+    (r'^bofs/create/$', views_edit.edit, {'action': "create"}, "bof_create"),
     (r'^(?P<acronym>[a-zA-Z0-9-._]+)/', include('ietf.group.urls_info_details')),
 )

ietf/group/urls_info.py

@@ -2,31 +2,31 @@
 from django.views.generic import RedirectView
 
 urlpatterns = patterns('',
-    (r'^$', 'ietf.group.info.group_home', None, "group_home"),
-    (r'^documents/txt/$', 'ietf.group.info.group_documents_txt'),
-    (r'^documents/$', 'ietf.group.info.group_documents', None, "group_docs"),
+    (r'^$', 'ietf.group.views.group_home', None, "group_home"),
+    (r'^documents/txt/$', 'ietf.group.views.group_documents_txt'),
+    (r'^documents/$', 'ietf.group.views.group_documents', None, "group_docs"),
     (r'^documents/manage/$', 'ietf.community.views.manage_list'),
     (r'^documents/csv/$', 'ietf.community.views.export_to_csv'),
     (r'^documents/feed/$', 'ietf.community.views.feed'),
     (r'^documents/subscription/$', 'ietf.community.views.subscription'),
-    (r'^charter/$', 'ietf.group.info.group_about', None, 'group_charter'),
-    (r'^about/$', 'ietf.group.info.group_about', None, 'group_about'),
-    (r'^about/status/$', 'ietf.group.info.group_about_status'),
-    (r'^about/status/edit/$', 'ietf.group.info.group_about_status_edit'),
-    (r'^history/$','ietf.group.info.history'),
-    (r'^email/$', 'ietf.group.info.email'),
-    (r'^deps/(?P<output_type>[\w-]+)/$', 'ietf.group.info.dependencies'),
-    (r'^meetings/$', 'ietf.group.info.meetings'),
-    (r'^init-charter/', 'ietf.group.edit.submit_initial_charter'),
-    (r'^edit/$', 'ietf.group.edit.edit', {'action': "edit"}, "group_edit"),
-    (r'^conclude/$', 'ietf.group.edit.conclude'),
+    (r'^charter/$', 'ietf.group.views.group_about', None, 'group_charter'),
+    (r'^about/$', 'ietf.group.views.group_about', None, 'group_about'),
+    (r'^about/status/$', 'ietf.group.views.group_about_status'),
+    (r'^about/status/edit/$', 'ietf.group.views.group_about_status_edit'),
+    (r'^history/$','ietf.group.views.history'),
+    (r'^email/$', 'ietf.group.views.email'),
+    (r'^deps/(?P<output_type>[\w-]+)/$', 'ietf.group.views.dependencies'),
+    (r'^meetings/$', 'ietf.group.views.meetings'),
+    (r'^init-charter/', 'ietf.group.views_edit.submit_initial_charter'),
+    (r'^edit/$', 'ietf.group.views_edit.edit', {'action': "edit"}, "group_edit"),
+    (r'^conclude/$', 'ietf.group.views_edit.conclude'),
     (r'^milestones/$', 'ietf.group.milestones.edit_milestones', {'milestone_set': "current"}, "group_edit_milestones"),
     (r'^milestones/charter/$', 'ietf.group.milestones.edit_milestones', {'milestone_set': "charter"}, "group_edit_charter_milestones"),
     (r'^milestones/charter/reset/$', 'ietf.group.milestones.reset_charter_milestones', None, "group_reset_charter_milestones"),
-    (r'^workflow/$', 'ietf.group.edit.customize_workflow'),
-    (r'^materials/$', 'ietf.group.info.materials', None, "group_materials"),
+    (r'^workflow/$', 'ietf.group.views_edit.customize_workflow'),
+    (r'^materials/$', 'ietf.group.views.materials', None, "group_materials"),
     (r'^materials/new/$', 'ietf.doc.views_material.choose_material_type'),
     (r'^materials/new/(?P<doc_type>[\w-]+)/$', 'ietf.doc.views_material.edit_material', { 'action': "new" }, "group_new_material"),
-    (r'^archives/$', 'ietf.group.info.derived_archives'),
-    url(r'^email-aliases/$', RedirectView.as_view(pattern_name='ietf.group.info.email',permanent=False),name='old_group_email_aliases'),
+    (r'^archives/$', 'ietf.group.views.derived_archives'),
+    url(r'^email-aliases/$', RedirectView.as_view(pattern_name='ietf.group.views.email',permanent=False),name='old_group_email_aliases'),
 )

ietf/group/urls_info_details.py

@@ -338,27 +338,27 @@ def construct_group_menu_context(request, group, selected, group_type, others):
     # menu entries
     entries = []
     if group.features.has_documents:
-        entries.append(("Documents", urlreverse("ietf.group.info.group_documents", kwargs=kwargs)))
+        entries.append(("Documents", urlreverse("ietf.group.views.group_documents", kwargs=kwargs)))
     if group.features.has_chartering_process:
         entries.append(("Charter", urlreverse("group_charter", kwargs=kwargs)))
     else:
         entries.append(("About", urlreverse("group_about", kwargs=kwargs)))
     if group.features.has_materials and get_group_materials(group).exists():
-        entries.append(("Materials", urlreverse("ietf.group.info.materials", kwargs=kwargs)))
+        entries.append(("Materials", urlreverse("ietf.group.views.materials", kwargs=kwargs)))
     if group.type_id in ('rg','wg','team'):
-        entries.append(("Meetings", urlreverse("ietf.group.info.meetings", kwargs=kwargs)))
-    entries.append(("Email expansions", urlreverse("ietf.group.info.email", kwargs=kwargs)))
-    entries.append(("History", urlreverse("ietf.group.info.history", kwargs=kwargs)))
+        entries.append(("Meetings", urlreverse("ietf.group.views.meetings", kwargs=kwargs)))
+    entries.append(("Email expansions", urlreverse("ietf.group.views.email", kwargs=kwargs)))
+    entries.append(("History", urlreverse("ietf.group.views.history", kwargs=kwargs)))
 
     if group.list_archive.startswith("http:") or group.list_archive.startswith("https:") or group.list_archive.startswith("ftp:"):
         if 'mailarchive.ietf.org' in group.list_archive:
-            entries.append(("List archive", urlreverse("ietf.group.info.derived_archives", kwargs=kwargs)))
+            entries.append(("List archive", urlreverse("ietf.group.views.derived_archives", kwargs=kwargs)))
         else:
             entries.append((mark_safe("List archive »"), group.list_archive))
 
     if group.features.has_documents:
         kwargs["output_type"] = "svg"
-        entries.append((mark_safe("Dependency graph »"), urlreverse("ietf.group.info.dependencies", kwargs=kwargs)))
+        entries.append((mark_safe("Dependency graph »"), urlreverse("ietf.group.views.dependencies", kwargs=kwargs)))
         del kwargs["output_type"]
 
     if group.has_tools_page():
@@ -388,10 +388,10 @@ def construct_group_menu_context(request, group, selected, group_type, others):
         actions.append((u"Edit group", urlreverse("group_edit", kwargs=kwargs)))
 
     if group.features.customize_workflow and (is_chair or can_manage):
-        actions.append((u"Customize workflow", urlreverse("ietf.group.edit.customize_workflow", kwargs=kwargs)))
+        actions.append((u"Customize workflow", urlreverse("ietf.group.views_edit.customize_workflow", kwargs=kwargs)))
 
     if group.state_id in ("active", "dormant") and not group.type_id in ["sdo", "rfcedtyp", "isoc", ] and can_manage:
-        actions.append((u"Request closing group", urlreverse("ietf.group.edit.conclude", kwargs=kwargs)))
+        actions.append((u"Request closing group", urlreverse("ietf.group.views_edit.conclude", kwargs=kwargs)))
 
     d = {
         "group": group,
@@ -573,7 +573,7 @@ def group_about_status_edit(request, acronym, group_type=None):
                     type='status_update',
                     desc=update_text,
                 ) 
-                return redirect('ietf.group.info.group_about',acronym=group.acronym)
+                return redirect('ietf.group.views.group_about',acronym=group.acronym)
         else:
             form = None
     else:

ietf/group/info.py ietf/group/views.pyietf/group/info.py renamed to ietf/group/views.py

@@ -23,7 +23,7 @@ def group_menu_data(request):
 
     groups_by_parent = defaultdict(list)
     for g in groups:
-        url = urlreverse("ietf.group.info.group_home", kwargs={ 'group_type': g.type_id, 'acronym': g.acronym })
+        url = urlreverse("ietf.group.views.group_home", kwargs={ 'group_type': g.type_id, 'acronym': g.acronym })
         groups_by_parent[g.parent_id].append({ 'acronym': g.acronym, 'name': escape(g.name), 'url': url })
 
     return JsonResponse(groups_by_parent)

ietf/group/ajax.py ietf/group/views_ajax.pyietf/group/ajax.py renamed to ietf/group/views_ajax.py

@@ -425,7 +425,7 @@ def customize_workflow(request, group_type, acronym):
 
             # redirect so the back button works correctly, otherwise
             # repeated POSTs fills up the history
-            return redirect("ietf.group.edit.customize_workflow", group_type=group.type_id, acronym=group.acronym)
+            return redirect("ietf.group.views_edit.customize_workflow", group_type=group.type_id, acronym=group.acronym)
 
         if action == "setnextstates":
             try:
@@ -442,7 +442,7 @@ def customize_workflow(request, group_type, acronym):
                 transitions, _ = GroupStateTransitions.objects.get_or_create(group=group, state=state)
                 transitions.next_states = next_states
 
-            return redirect("ietf.group.edit.customize_workflow", group_type=group.type_id, acronym=group.acronym)
+            return redirect("ietf.group.views_edit.customize_workflow", group_type=group.type_id, acronym=group.acronym)
 
         if action == "settagactive":
             active = request.POST.get("active") == "1"
@@ -456,7 +456,7 @@ def customize_workflow(request, group_type, acronym):
             else:
                 group.unused_tags.add(tag)
 
-            return redirect("ietf.group.edit.customize_workflow", group_type=group.type_id, acronym=group.acronym)
+            return redirect("ietf.group.views_edit.customize_workflow", group_type=group.type_id, acronym=group.acronym)
 
     # put some info for the template on tags and states
     unused_tags = group.unused_tags.all().values_list('slug', flat=True)

ietf/group/edit.py ietf/group/views_edit.pyietf/group/edit.py renamed to ietf/group/views_edit.py

@@ -180,7 +180,7 @@ def test_group_json(self):
         make_meeting_test_data()
         group = Group.objects.get(acronym="mars")
 
-        url = urlreverse("ietf.group.ajax.group_json", kwargs=dict(acronym=group.acronym))
+        url = urlreverse("ietf.group.views_ajax.group_json", kwargs=dict(acronym=group.acronym))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         info = json.loads(r.content)

ietf/meeting/tests_api.py

@@ -14,9 +14,9 @@
     <ul class="dropdown-menu" role="menu">
   {% endif %}
 
-  <li><a href="{% url "ietf.group.info.active_groups" group_type="wg" %}">Active WGs</a></li>
-  <li><a href="{% url "ietf.group.info.active_groups" group_type="rg" %}">Active RGs</a></li>
-  <li class="dropdown-submenu group-menu"><a href="{% url "ietf.group.info.active_groups" %}">Other</a>{% active_groups_menu %} </li>
+  <li><a href="{% url "ietf.group.views.active_groups" group_type="wg" %}">Active WGs</a></li>
+  <li><a href="{% url "ietf.group.views.active_groups" group_type="rg" %}">Active RGs</a></li>
+  <li class="dropdown-submenu group-menu"><a href="{% url "ietf.group.views.active_groups" %}">Other</a>{% active_groups_menu %} </li>
 
   {% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
   <li {%if flavor == "top" %}class="dropdown-header visible-lg-block"{% else %}class="nav-header hidden-nojs"{% endif %}>By area/parent</li>
@@ -25,12 +25,12 @@
 
   {% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
   <li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>New work</li>
-  <li><a href="{% url "ietf.group.info.chartering_groups" %}">Chartering groups</a></li>
-  <li><a href="{% url "ietf.group.info.bofs" group_type="wg" %}">BOFs</a></li>
+  <li><a href="{% url "ietf.group.views.chartering_groups" %}">Chartering groups</a></li>
+  <li><a href="{% url "ietf.group.views.bofs" group_type="wg" %}">BOFs</a></li>
 
   {% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
   <li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>Other groups</li>
-  <li><a href="{% url "ietf.group.info.concluded_groups" %}">Concluded groups</a></li>
+  <li><a href="{% url "ietf.group.views.concluded_groups" %}">Concluded groups</a></li>
   <li><a href="https://www.ietf.org/list/nonwg.html">Non-WG lists</a></li>
 
 {% if flavor == "top" %}</ul>{% endif %}