summaryrefslogtreecommitdiff
path: root/coip/urls.py
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-09-20 11:01:05 +0200
committerLeif Johansson <leifj@sunet.se>2011-09-20 11:01:05 +0200
commitbc0b2364b1a22ecc9662ddfce1a4bd314f38f79b (patch)
treef2b2446f44cc276e12a7e1ea0749822f98464893 /coip/urls.py
parentcd364fba4c45f80cfd326f786c3d4901b2d464c2 (diff)
removed entity model, celery
Diffstat (limited to 'coip/urls.py')
-rw-r--r--coip/urls.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/coip/urls.py b/coip/urls.py
index 13c422f..29ad522 100644
--- a/coip/urls.py
+++ b/coip/urls.py
@@ -26,10 +26,13 @@ urlpatterns = patterns('',
# Profiles and user information
#(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'),
- (r'^user/(.+)/groups.json$', 'coip.apps.name.views.user_groups'),
- (r'^user/search.json$', 'coip.apps.userprofile.views.search'),
- (r'^user/info/(.+).json$', 'coip.apps.userprofile.views.info'),
+ (r'^user/home$', 'coip.apps.userprofile.views.home'),
+ (r'^user/alias$', 'coip.apps.userprofile.views.add_alias'),
+ (r'^user/alias/sshkey$', 'coip.apps.userprofile.views.add_sshkey'),
+ (r'^user/alias/cert$', 'coip.apps.userprofile.views.add_cert'),
+ (r'^user/(.+)/groups.json$', 'coip.apps.name.views.user_groups'),
+ (r'^user/search.json$', 'coip.apps.userprofile.views.search'),
+ (r'^user/info/(.+).json$', 'coip.apps.userprofile.views.info'),
# Invitations
(r'^name/(?P<id>[0-9]+)/invite$', 'coip.apps.invitation.views.invite'),
(r'^invitation/(?P<id>[0-9]+)/cancel$', 'coip.apps.invitation.views.cancel'),