From d60a62a68a5c3442a6b464cca1c1a218d57d8ecc Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Thu, 3 Mar 2011 23:28:11 +0100 Subject: new acl UI --- coip/urls.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'coip/urls.py') diff --git a/coip/urls.py b/coip/urls.py index ffabf11..edca1cc 100644 --- a/coip/urls.py +++ b/coip/urls.py @@ -35,19 +35,22 @@ urlpatterns = patterns('', # Names (r'^name/id/(?P[0-9]+)(?:\.([^\.]+))?$', 'coip.apps.name.views.show_by_id'), (r'^name$', 'coip.apps.name.views.show_root'), + (r'^name/search.json$', 'coip.apps.name.views.search'), (r'^name/(?P[0-9]+)/edit$', 'coip.apps.name.views.edit'), (r'^name/(?P[0-9]+)/delete$', 'coip.apps.name.views.delete'), (r'^name/(?P[0-9]+)/add$', 'coip.apps.name.views.add'), (r'^name/(?P[0-9]+)/join$', 'coip.apps.membership.views.join'), (r'^name/(?P[0-9]+)/join/(?P[^\/]+)$', 'coip.apps.membership.views.join'), (r'^name/(?P[0-9]+)/leave/(?P[^\/]+)$', 'coip.apps.membership.views.leave'), - (r'^name/(?P.+)(?:\.([^\.]+))?$', 'coip.apps.name.views.show_by_name'), # Name Links (r'^name/(?P[0-9]+)/link/(?P[0-9]+).json$', 'coip.apps.name.views.links'), (r'^namelink/(?P[0-9]+)/remove$', 'coip.apps.name.views.removelink'), - (r'^name/(?P[0-9]+)/link/(?P[0-9]+)$', 'coip.apps.name.views.editacl'), + # ACL + (r'^name/(?P[0-9]+)/acl/(?P[0-9]+)$', 'coip.apps.name.views.lsacl'), + (r'^name/(?P[0-9]+)/acl/(?P[0-9]+)/add$', 'coip.apps.name.views.addacl'), # Links (r'^name/(?P[0-9]+)/addlink$', 'coip.apps.link.views.add'), + (r'^name/(?P.+)(?:\.([^\.]+))?$', 'coip.apps.name.views.show_by_name'), (r'^link/(?P[0-9]+)/remove$', 'coip.apps.link.views.remove'), # Membership (r'^membership/(?P[0-9]+)$', 'coip.apps.membership.views.show'), -- cgit v1.1 From f0dd7b2469b6d276fdfdc0a0dc4da5101ce272cc Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Fri, 4 Mar 2011 00:30:55 +0100 Subject: fix removing acls --- coip/urls.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'coip/urls.py') diff --git a/coip/urls.py b/coip/urls.py index edca1cc..4535785 100644 --- a/coip/urls.py +++ b/coip/urls.py @@ -44,10 +44,11 @@ urlpatterns = patterns('', (r'^name/(?P[0-9]+)/leave/(?P[^\/]+)$', 'coip.apps.membership.views.leave'), # Name Links (r'^name/(?P[0-9]+)/link/(?P[0-9]+).json$', 'coip.apps.name.views.links'), - (r'^namelink/(?P[0-9]+)/remove$', 'coip.apps.name.views.removelink'), # ACL - (r'^name/(?P[0-9]+)/acl/(?P[0-9]+)$', 'coip.apps.name.views.lsacl'), - (r'^name/(?P[0-9]+)/acl/(?P[0-9]+)/add$', 'coip.apps.name.views.addacl'), + (r'^name/(?P[0-9]+)/acl/(?P[0-9]+)$', 'coip.apps.name.views.lsacl'), + (r'^name/(?P[0-9]+)/acl/(?P[0-9]+)/add$', 'coip.apps.name.views.addacl'), + (r'^name/(?P[0-9]+)/acl/(?P[0-9]+)/copy$', 'coip.apps.name.views.copyacl'), + (r'^name/(?P[0-9]+)/acl/(?P[0-9]+)/remove$', 'coip.apps.name.views.rmacl'), # Links (r'^name/(?P[0-9]+)/addlink$', 'coip.apps.link.views.add'), (r'^name/(?P.+)(?:\.([^\.]+))?$', 'coip.apps.name.views.show_by_name'), -- cgit v1.1