diff options
| author | Johan Berggren <jbn@nordu.net> | 2011-03-04 14:38:19 +0100 |
|---|---|---|
| committer | Johan Berggren <jbn@nordu.net> | 2011-03-04 14:38:19 +0100 |
| commit | 613ab889ea717c86cda5b61332027581d6eb61e8 (patch) | |
| tree | f46c11bc3bdb97e5fcdd7c8c0c470cf7d28bec29 /coip/urls.py | |
| parent | 07a04353ebacf6769683b55694d5aa78139d1d4f (diff) | |
| parent | f0dd7b2469b6d276fdfdc0a0dc4da5101ce272cc (diff) | |
Merge branch 'master' of git.nordu.net:coip
Diffstat (limited to 'coip/urls.py')
| -rw-r--r-- | coip/urls.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/coip/urls.py b/coip/urls.py index 4391f38..2b30391 100644 --- a/coip/urls.py +++ b/coip/urls.py @@ -35,19 +35,23 @@ urlpatterns = patterns('', # Names (r'^name/id/(?P<id>[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<id>[0-9]+)/edit$', 'coip.apps.name.views.edit'), (r'^name/(?P<id>[0-9]+)/delete$', 'coip.apps.name.views.delete'), (r'^name/(?P<id>[0-9]+)/add$', 'coip.apps.name.views.add'), (r'^name/(?P<id>[0-9]+)/join$', 'coip.apps.membership.views.join'), (r'^name/(?P<id>[0-9]+)/join/(?P<membername>[^\/]+)$', 'coip.apps.membership.views.join'), (r'^name/(?P<id>[0-9]+)/leave/(?P<membername>[^\/]+)$', 'coip.apps.membership.views.leave'), - (r'^name/(?P<name>.+)(?:\.([^\.]+))?$', 'coip.apps.name.views.show_by_name'), # Name Links (r'^name/(?P<id>[0-9]+)/link/(?P<type>[0-9]+).json$', 'coip.apps.name.views.links'), - (r'^namelink/(?P<id>[0-9]+)/remove$', 'coip.apps.name.views.removelink'), - (r'^name/(?P<id>[0-9]+)/link/(?P<type>[0-9]+)$', 'coip.apps.name.views.editacl'), + # ACL + (r'^name/(?P<id>[0-9]+)/acl/(?P<type>[0-9]+)$', 'coip.apps.name.views.lsacl'), + (r'^name/(?P<id>[0-9]+)/acl/(?P<type>[0-9]+)/add$', 'coip.apps.name.views.addacl'), + (r'^name/(?P<id>[0-9]+)/acl/(?P<type>[0-9]+)/copy$', 'coip.apps.name.views.copyacl'), + (r'^name/(?P<id>[0-9]+)/acl/(?P<aclid>[0-9]+)/remove$', 'coip.apps.name.views.rmacl'), # Links (r'^name/(?P<id>[0-9]+)/addlink$', 'coip.apps.link.views.add'), + (r'^name/(?P<name>.+)(?:\.([^\.]+))?$', 'coip.apps.name.views.show_by_name'), (r'^link/(?P<id>[0-9]+)/remove$', 'coip.apps.link.views.remove'), # Membership (r'^membership/(?P<id>[0-9]+)$', 'coip.apps.membership.views.show'), |