Changeset bd72d5c for asadb/urls.py

Timestamp:

Sep 15, 2011, 3:34:54 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

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

Children:

5c68184

Parents:

ceaf3bd (diff), fbb362a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Alex Dehnert <adehnert@…> (09/15/11 15:34:54)

git-committer:

Alex Dehnert <adehnert@…> (09/15/11 15:34:54)

Message:

Merge remote branch 'remotes/origin/new-db'

File:

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

asadb/urls.py

@@ -9 +9 @@
 import settings
 
+import groups.urls
 import forms.views
-
-import groups.models
 
 urlpatterns = patterns('',
     # Example:
     # (r'^asadb/', include('asadb.foo.urls')),
-    url(
-        r'^$',
-        'django.views.generic.simple.direct_to_template',
-        {'template': 'index.html', 'extra_context': { 'pagename':'homepage' }, },
-        name='homepage',
-    ),
+    url(r'^$', 'groups.views.view_homepage', name='homepage', ),
 
     # FYSM
@@ -45 +39 @@
 
     # Group list
-    url(
-        r'^groups/$',
-        list_detail.object_list,
-        {
-            'queryset': groups.models.Group.objects.all(),
-            'template_object_name': 'group',
-            'extra_context': {'pagename': 'groups', },
-        },
-        name='group-list',
-    ),
+    (r'^groups/', include(groups.urls.urls(), ), ),
 
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs' 
@@ -62 +47 @@
     # Uncomment the next line to enable the admin:
     (r'^admin/', include(admin.site.urls)),
+    url(r'^accounts/login/password/', 'django.contrib.auth.views.login', name='login-password', ),
     url(r'^accounts/login/',  'mit.scripts_login',  name='login', ),
     url(r'^accounts/logout/', logout, name='logout', ),