ask for confirmation when deleting a roa request

svn path=/rpkid/rpki/gui/app/templates/base.html; revision=3773

3 files changed, 15 insertions, 13 deletions

diff --git a/rpkid/rpki/gui/app/templates/base.html b/rpkid/rpki/gui/app/templates/base.html
index 08c89a2e..d6c859f2 100644
--- a/rpkid/rpki/gui/app/templates/base.html
+++ b/rpkid/rpki/gui/app/templates/base.html
@@ -7,6 +7,9 @@
     #sidebar { background-color: #dddddd; border-style: none solid solid; border-width: thin; float:left; min-width:9em }
     #content { float:left; margin-left:1em }
     ul.compact {list-style:none inside; margin-left:1em; padding-left:0}
+    table { border: solid 1px; border-collapse: collapse }
+    th { border: solid 1px; padding: 1em }
+    td { border: solid 1px; text-align: center; padding-left: 1em; padding-right: 1em }
     {% block css %}{% endblock %}
   </style>
 </head>
diff --git a/rpkid/rpki/gui/app/templates/rpkigui/prefix_view.html b/rpkid/rpki/gui/app/templates/rpkigui/prefix_view.html
index 8d02e9ad..6679eff9 100644
--- a/rpkid/rpki/gui/app/templates/rpkigui/prefix_view.html
+++ b/rpkid/rpki/gui/app/templates/rpkigui/prefix_view.html
@@ -1,11 +1,5 @@
 {% extends "base.html" %}
 
-{% block css %}
-table { border: solid 1px; border-collapse: collapse }
-th { border: solid 1px; padding: 1em }
-td { border: solid 1px; text-align: center; padding-left: 1em; padding-right: 1em }
-{% endblock %}
-
 {% block sidebar %}
 <ul class='compact'>
 {% if not addr.allocated %}
diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py
index 06db8b12..58979ee5 100644
--- a/rpkid/rpki/gui/app/views.py
+++ b/rpkid/rpki/gui/app/views.py
@@ -365,7 +365,10 @@ def prefix_delete_view(request, pk):
 
 @handle_required
 def roa_request_delete_view(request, pk):
-    '''Remove a roa request from a particular prefix.'''
+    """
+    Remove a ROA request from a particular prefix.
+    """
+
     log = request.META['wsgi.errors']
     handle = request.session['handle']
     obj = get_object_or_404(models.RoaRequest.objects, pk=pk)
@@ -373,13 +376,15 @@ def roa_request_delete_view(request, pk):
     # ensure this resource range belongs to a parent of the current conf
     parent_set = get_parents_or_404(handle, prefix)
 
-    roa = obj.roa
-    obj.delete()
-    if not roa.from_roa_request.all():
-        roa.delete()
-    glue.configure_resources(log, handle)
+    if request.method == 'POST':
+        roa = obj.roa
+        obj.delete()
+        if not roa.from_roa_request.all():
+            roa.delete()
+        glue.configure_resources(log, handle)
+        return http.HttpResponseRedirect(prefix.get_absolute_url())
 
-    return http.HttpResponseRedirect(prefix.get_absolute_url())
+    return render('rpkigui/roa_request_confirm_delete.html', { 'object': obj }, request)
 
 @handle_required
 def asn_allocate_view(request, pk):