summaryrefslogtreecommitdiff
path: root/coip/urls.py
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2010-07-07 15:49:09 +0200
committerLeif Johansson <leifj@sunet.se>2010-07-07 15:49:09 +0200
commit8e00889fa34467dfecad1cf52acbb67de154a6cf (patch)
treecef5929fc216bf4844febd24a442092323e993b6 /coip/urls.py
parentd7fd23e48835a8641f748d54cef3207021c46ac6 (diff)
basic group views
Diffstat (limited to 'coip/urls.py')
-rw-r--r--coip/urls.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/coip/urls.py b/coip/urls.py
index eda9440..d2256dd 100644
--- a/coip/urls.py
+++ b/coip/urls.py
@@ -16,7 +16,10 @@ urlpatterns = patterns('',
(r'^accounts/login-federated/$', 'coip.apps.auth.views.accounts_login_federated'),
(r'^accounts/logout/$', 'coip.apps.auth.views.logout'),
# Profiles and user information
- (r'^user/merge/?P<pkey>.+$', 'coip.apps.userprofile.views.merge'),
+ (r'^user/merge/(?P<pkey>.+)$', 'coip.apps.userprofile.views.merge'),
(r'^user/merge$', 'coip.apps.userprofile.views.merge'),
(r'^user/home$', 'coip.apps.userprofile.views.home'),
+ # Names
+ (r'^name/id/(?P<id>[0-9]+)$', 'coip.apps.name.views.show_by_id'),
+ (r'^name/(?P<name>[^\/]+)$', 'coip.apps.name.views.show_by_name'),
)