Changeset fbb362a for asadb/urls.py

Timestamp:

Aug 25, 2011, 10:53:03 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage, test-hooks

Children:

9b391ce, 165e5aa

Parents:

d3167b9

git-author:

Alex Dehnert <adehnert@…> (08/25/11 22:53:03)

git-committer:

Alex Dehnert <adehnert@…> (08/25/11 22:53:03)

Message:

Rearrange URLs

This factors out the common "groups" prefix, makes "groups" be used even for
single-group things, and puts group-related stuff in a single namespace.
(Django is lame, and while nested namespaces work, namespaces with wildcards
in the prefix don't, so I can't make a groups:group namespace, which would be
cute.)

File:

• asadb/urls.py (modified) (2 diffs)

asadb/urls.py

@@ -9 +9 @@
 import settings
 
+import groups.urls
 import forms.views
-import groups.models
-import groups.views
-
 
 urlpatterns = patterns('',
@@ -31 +29 @@
     url(r'^fysm/(?:(\d+)/)?(?:([\w-]+)/)?$', forms.views.fysm_by_years, name='fysm', ),
 
-    # Group editing
-    url(r'^group/(\d+)/edit/main$', groups.views.manage_main, name='group-manage-main', ),
-    url(r'^group/(\d+)/edit/officers$', groups.views.manage_officers, name='group-manage-officers', ),
-
     # Group list
-    url(r'^groups/$', groups.views.GroupListView.as_view(), name='group-list', ),
-    url(r'^groups/search/$', groups.views.search_groups, name='group-search', ),
-    url(r'^group/(?P<pk>\d+)/$', groups.views.GroupDetailView.as_view(), name='group-detail', ),
-    url(r'^groups/recent_changes/$', groups.views.GroupHistoryView.as_view(), name='groups-manage-history', ),
-    url(r'^group/(?P<group>\d+)/history/$', groups.views.GroupHistoryView.as_view(), name='group-manage-history', ),
-    url(r'^groups/signatories/$', groups.views.view_signatories, name='groups-signatories', ),
+    (r'^groups/', include(groups.urls.urls(), ), ),
 
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs'