form ui cleanup + remove links with names

1 files changed, 5 insertions, 5 deletions

diff --git a/coip/apps/name/views.py b/coip/apps/name/views.py
index de5c3af..bde9954 100644
--- a/coip/apps/name/views.py
+++ b/coip/apps/name/views.py
@@ -27,18 +27,18 @@ def delete(request,id):
     if request.method == 'POST':
         form = NameDeleteForm(request.POST)
         if form.is_valid():
-            if not form.cleaned_data['confirm']:
-                return HttpResponseRedirect("/name/id/%d" % name.id)
-                
             parent = name.parent
             if not form.cleaned_data['recursive'] and name.children.count() > 0:
                 return HttpResponseForbidden("Will not delete non-empty node")
             
+            for link in name.links:
+                link.delete()
+            
             if form.cleaned_data['recursive']:
                 name.remove(True)
             else:
                 name.remove(False)
-                
+            
             if parent:
                 return HttpResponseRedirect("/name/id/%d" % parent.id)
             else:
@@ -46,7 +46,7 @@ def delete(request,id):
     else:
         form = NameDeleteForm()
             
-    return respond_to(request,{'text/html': 'apps/name/edit.html'},{'form': form,'name': name,'formtitle': 'Remove name confirmation' ,'submitname': 'Delete'})
+    return respond_to(request,{'text/html': 'apps/name/edit.html'},{'form': form,'name': name,'formtitle': 'Remove %s' % (name.short) ,'submitname': 'Delete'})
 
 @login_required
 def add(request,id):