summaryrefslogtreecommitdiff
path: root/coip/urls.py
diff options
context:
space:
mode:
authorJohan Berggren <jbn@nordu.net>2011-02-24 14:34:07 +0100
committerJohan Berggren <jbn@nordu.net>2011-02-24 14:34:07 +0100
commit04bb6790d4d455b2bbd56f55363954ce7a7b195b (patch)
tree3b7786b0af3a2d8b24556de4df883cc417108acf /coip/urls.py
parent4a4dafe9f8376585dff0579e415b1d885f4f5ae0 (diff)
Minor fix to invitations. Need more work.
Diffstat (limited to 'coip/urls.py')
-rw-r--r--coip/urls.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/coip/urls.py b/coip/urls.py
index 78200ce..9904b6e 100644
--- a/coip/urls.py
+++ b/coip/urls.py
@@ -26,6 +26,11 @@ urlpatterns = patterns('',
(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'),
+ # 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'),
+ (r'^invitation/(?P<id>[0-9]+)/resend$', 'coip.apps.invitation.views.resend'),
+ (r'^invitation/(?P<nonce>[^\/]+)/accept$', 'coip.apps.invitation.views.accept'),
# Names
(r'^name/id/(?P<id>[0-9]+)$', 'coip.apps.name.views.show_by_id'),
(r'^name$', 'coip.apps.name.views.show_root'),
@@ -42,11 +47,6 @@ urlpatterns = patterns('',
(r'^link/(?P<id>[0-9]+)/remove$', 'coip.apps.link.views.remove'),
# Membership
(r'^membership/(?P<id>[0-9]+)$', 'coip.apps.membership.views.show'),
- # 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'),
- (r'^invitation/(?P<id>[0-9]+)/resend$', 'coip.apps.invitation.views.resend'),
- (r'^invitation/(?P<nonce>[^\/]+)/accept$', 'coip.apps.invitation.views.accept'),
# JSON Tree
(r'^ctree.json$', 'coip.apps.name.views.ctree'),
(r'^ctree/(?P<id>[0-9]+).json$', 'coip.apps.name.views.ctree'),