fix selective deletion of roa requests in prefix view page

svn path=/rpkid/rpki/gui/app/models.py; revision=3654

3 files changed, 20 insertions, 2 deletions

diff --git a/rpkid/rpki/gui/app/models.py b/rpkid/rpki/gui/app/models.py
index ca26c91c..5279e3b5 100644
--- a/rpkid/rpki/gui/app/models.py
+++ b/rpkid/rpki/gui/app/models.py
@@ -107,6 +107,11 @@ class RoaRequest(models.Model):
         else:
             return rpki.resource_set.roa_prefix_ipv6(r.min, r.prefixlen(),
                     self.max_length)
+
+    @models.permalink
+    def get_absolute_url(self):
+        return ('rpki.gui.app.views.roa_request_view', [str(self.pk)])
+
 class Asn(models.Model):
     '''An ASN or range thereof.'''
     lo = models.IntegerField(blank=False)
@@ -203,7 +208,8 @@ class Roa(models.Model):
     def __unicode__(self):
 	return u"%s's ROA for %d" % (self.conf, self.asn)
 
+    @models.permalink
     def get_absolute_url(self):
-        return ('rpki.gui.app.views.dashboard', '/roa/' + [str(self.pk)])
+        return ('rpki.gui.app.views.roa_view', [str(self.pk)])
 
 # vim:sw=4 ts=8 expandtab
diff --git a/rpkid/rpki/gui/app/urls.py b/rpkid/rpki/gui/app/urls.py
index 24b311e5..f1a0416a 100644
--- a/rpkid/rpki/gui/app/urls.py
+++ b/rpkid/rpki/gui/app/urls.py
@@ -38,7 +38,9 @@ urlpatterns = patterns('',
     (r'^address/(?P<pk>\d+)/delete$', views.prefix_delete_view),
     (r'^asn/(?P<pk>\d+)$', views.asn_view),
     (r'^asn/(?P<pk>\d+)/allocate$', views.asn_allocate_view),
-    (r'^roa/(?P<pk>\d+)/delete$', views.roa_request_delete_view),
+    (r'^roa/(?P<pk>\d+)$', views.roa_view),
+    (r'^roareq/(?P<pk>\d+)$', views.roa_request_view),
+    (r'^roareq/(?P<pk>\d+)/delete$', views.roa_request_delete_view),
     (r'^demo/down/asns/(?P<self_handle>[^/]+)$', views.download_asns),
     (r'^demo/down/prefixes/(?P<self_handle>[^/]+)$', views.download_prefixes),
     (r'^demo/down/roas/(?P<self_handle>[^/]+)$', views.download_roas),
diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py
index b0acf0fa..80d9dba0 100644
--- a/rpkid/rpki/gui/app/views.py
+++ b/rpkid/rpki/gui/app/views.py
@@ -552,4 +552,14 @@ def upload_myrpki_xml(request, self_handle):
 
     return serve_file(self_handle, 'myrpki.xml', 'application/xml')
 
+@handle_required
+def roa_request_view(request, pk):
+    """not yet implemented"""
+    return
+
+@handle_required
+def roa_view(request, pk):
+    """not yet implemented"""
+    return
+
 # vim:sw=4 ts=8 expandtab