add generic template for viewing a list of objects as a table

format roa request deletion confirmation page into two columns, with an alert box around the action

remove trailing slash from roa_detail url

svn path=/branches/tk161/; revision=4250

1 files changed, 8 insertions, 7 deletions

diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py
index a688cdfc..758b383d 100644
--- a/rpkid/rpki/gui/app/views.py
+++ b/rpkid/rpki/gui/app/views.py
@@ -416,13 +416,19 @@ def login(request):
 
 
 @handle_required
+def roa_create(request):
+    conf = request.session['handle']
+
+
+@handle_required
 def roa_list(request):
     "Displays a list of ROARequestPrefix objects for the current resource handle."
     conf = request.session['handle']
     qs = models.ROARequestPrefix.objects.filter(roa_request__issuer=conf)
     return object_list(request, queryset=qs,
             template_name='app/roa_request_list.html',
-            extra_context={'page_title': 'ROA Requests'})
+            extra_context={'page_title': 'ROA Requests',
+                'create_url': reverse(roa_create)})
 
 
 @handle_required
@@ -464,7 +470,7 @@ def roa_delete(request, pk):
     # exclude ROAs which seem to match this request and display the result
     routes = []
     for route, roas in match:
-        qs = roas.exclude(asid=obj.roa.asn, **args)
+        qs = roas.exclude(asid=obj.roa_request.asn, **args)
         validate_route(route, qs)
         routes.append(route)
 
@@ -473,11 +479,6 @@ def roa_delete(request, pk):
 
 
 @handle_required
-def roa_create(request):
-    conf = request.session['handle']
-
-
-@handle_required
 def ghostbusters_list(request):
     """
     Display a list of all ghostbuster requests for the current Conf.