update roa templates to match models.RoaRequestPrefix

models.RoaRequestPrefix.get_absolute_url restored since the /delete URL depends on it

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

5 files changed, 20 insertions, 9 deletions

diff --git a/rpkid/rpki/gui/app/models.py b/rpkid/rpki/gui/app/models.py
index bec4bdf7..53a708e3 100644
--- a/rpkid/rpki/gui/app/models.py
+++ b/rpkid/rpki/gui/app/models.py
@@ -129,6 +129,10 @@ class RoaRequestPrefix(rpki.irdb.models.RoaRequestPrefix):
             r = resource_set.resource_range_ipv6.make_prefix(ipaddrs.v6addr(self.prefix), self.prefixlen)
         return r
 
+    @models.permalink
+    def get_absolute_url(self):
+        return ('rpki.gui.app.views.roa_detail', [str(self.pk)])
+
 class Ghostbuster(models.Model):
     """
     Stores the information require to fill out a vCard entry to populate
diff --git a/rpkid/rpki/gui/app/templates/rpkigui/roa_request_confirm_delete.html b/rpkid/rpki/gui/app/templates/rpkigui/roa_request_confirm_delete.html
index 9b53e4a9..804e4c30 100644
--- a/rpkid/rpki/gui/app/templates/rpkigui/roa_request_confirm_delete.html
+++ b/rpkid/rpki/gui/app/templates/rpkigui/roa_request_confirm_delete.html
@@ -3,14 +3,14 @@
 {% block content %}
 
 <div class='page-header'>
-<h1>Delete ROA Request</h1>
+<h1>Delete ROA Prefix</h1>
 </div>
 
-<p>Please confirm that you would like to delete the following ROA request:
+<p>Please confirm that you would like to delete the following ROA prefix:
 
 <table style='condensed-table'>
-  <tr><th>AS</th>        <td>{{ object.roa.asn }}</td></tr>
-  <tr><th>Prefix</th>    <td><a href="{{ object.prefix.get_absolute_url }}">{{ object.prefix }}</a></td></tr>
+  <tr><th>AS</th>        <td>{{ object.roa_request.asn }}</td></tr>
+  <tr><th>Prefix</th>    <td>{{ object.as_roa_prefix }}</td></tr>
   <tr><th>Max Length</th><td>{{ object.max_length }}</td></tr>
 </table>
 
@@ -36,7 +36,7 @@ that are covered by this ROA will be if this ROA request is deleted:
   {% csrf_token %}
   <div class='actions'>
     <input class='btn danger' type='submit' value='Delete'/>
-    <a class='btn' href="{{ object.prefix.get_absolute_url }}">Cancel</a>
+    <a class='btn' href="{% url rpki.gui.app.views.roa_list %}">Cancel</a>
   </div>
 </form>
 
diff --git a/rpkid/rpki/gui/app/templates/rpkigui/roa_request_list.html b/rpkid/rpki/gui/app/templates/rpkigui/roa_request_list.html
index 4531bca1..c92395ec 100644
--- a/rpkid/rpki/gui/app/templates/rpkigui/roa_request_list.html
+++ b/rpkid/rpki/gui/app/templates/rpkigui/roa_request_list.html
@@ -6,13 +6,13 @@
 </div>
 
 {% if object_list %}
-<table class='zebra-striped'>
-  <tr><th>Prefix</th><th>Max Length</th><th>ASN</th></tr>
+<table class='zebra-striped condensed-table'>
+  <tr><th>Prefix</th><th>Max Length</th><th>ASN</th><th>Action</th></tr>
   {% for object in object_list %}
   <tr>
-    <td><a href="{{ object.prefix.get_absolute_url }}">{{ object.prefix }}</a></td>
+    <td>{{ object.as_roa_prefix }}</a></td>
     <td>{{ object.max_length }}</td>
-    <td>{{ object.roa.asn }}</td>
+    <td>{{ object.roa_request.asn }}</td>
     <td><a class='btn danger' href="{{ object.get_absolute_url }}/delete">Delete</a></td>
   </tr>
   {% endfor %}
diff --git a/rpkid/rpki/gui/app/urls.py b/rpkid/rpki/gui/app/urls.py
index 4c87aa43..c57c2ef8 100644
--- a/rpkid/rpki/gui/app/urls.py
+++ b/rpkid/rpki/gui/app/urls.py
@@ -43,6 +43,7 @@ urlpatterns = patterns('',
     (r'^gbr/(?P<pk>\d+)/delete$', views.ghostbuster_delete),
     (r'^refresh$', views.refresh),
     (r'^roa/$', views.roa_list),
+    (r'^roa/(?P<pk>\d+)/$', views.roa_detail),
     (r'^roa/(?P<pk>\d+)/delete$', views.roa_delete),
     (r'^routes/$', views.route_view),
     (r'^demo/down/asns/(?P<self_handle>[^/]+)$', views.download_asns),
diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py
index 39213266..3f0c4c34 100644
--- a/rpkid/rpki/gui/app/views.py
+++ b/rpkid/rpki/gui/app/views.py
@@ -328,6 +328,12 @@ def roa_list(request):
         extra_context = { 'page_title': 'ROA Requests' })
 
 @handle_required
+def roa_detail(request, pk):
+    """Not implemented.  This is a placeholder so that models.RoaRequestPrefix.get_absolute_url
+    works.  The only reason it exist is so that the /delete URL works."""
+    pass
+
+@handle_required
 def roa_delete(request, pk):
     """Handles deletion of a single RoaRequestPrefix object.