From f0dd7b2469b6d276fdfdc0a0dc4da5101ce272cc Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Fri, 4 Mar 2011 00:30:55 +0100
Subject: fix removing acls

---
 coip/apps/name/views.py       | 6 +++---
 coip/urls.py                  | 7 ++++---
 templates/apps/name/acls.html | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/coip/apps/name/views.py b/coip/apps/name/views.py
index 3032374..36a0f16 100644
--- a/coip/apps/name/views.py
+++ b/coip/apps/name/views.py
@@ -140,15 +140,15 @@ def links(request,id,type=NameLink.access_control):
     
 
 @login_required
-def removelink(request,id):
-    link = get_object_or_404(NameLink,pk=id)
+def rmacl(request,id,aclid):
+    link = get_object_or_404(NameLink,pk=aclid)
     name = link.src
     type = link.type
     if not name.has_permission(request.user,'w'):
         return render403("You do not have permission to remove name links from %s" % (name))
     
     link.delete()
-    return HttpResponseRedirect("/name/{{name.id}}/link/{{type}}")
+    return HttpResponseRedirect("/name/%d/acl/%s" % (name.id,type))
     
 @login_required
 def show_root(request):
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<id>[0-9]+)/leave/(?P<membername>[^\/]+)$',                  'coip.apps.membership.views.leave'),
     # 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'),
     # 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]+)$',         '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'),
diff --git a/templates/apps/name/acls.html b/templates/apps/name/acls.html
index 3d3d134..7fe8250 100644
--- a/templates/apps/name/acls.html
+++ b/templates/apps/name/acls.html
@@ -17,7 +17,7 @@
 	      <div>{{ace.dst|acldstdisplay}} {{ace.data|permdisplay}}.</div>
 	      <div class="rlist button">
 	         <ul>
-	            <li><a href="/namelink/{{ace.id}}/remove">Remove</a></li>
+	            <li><a href="/name/{{ace.src.id}}/acl/{{ace.id}}/remove">Remove</a></li>
 	         </ul>
 	      </div>
 	   </div>
-- 
cgit v1.1