aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Elkins <melkins@tislabs.com>2012-01-20 14:38:14 +0000
committerMichael Elkins <melkins@tislabs.com>2012-01-20 14:38:14 +0000
commitaf9086bd367c023647e60490e0f32e03105408b2 (patch)
treeca950ec198061f7678fe02e70cf10c40f2f0d572
parent329707277cfd17cd5945e72339a320bc5c7f6282 (diff)
fix roa request list template to reflect the irdb RoaRequestPrefix model
add stub view function for roa creation as a placeholder so that the {% url %} for the Create button doesn't throw an exception. svn path=/branches/tk161/; revision=4246
-rw-r--r--rpkid/rpki/gui/app/templates/app/roa_request_list.html11
-rw-r--r--rpkid/rpki/gui/app/urls.py1
-rw-r--r--rpkid/rpki/gui/app/views.py4
3 files changed, 13 insertions, 3 deletions
diff --git a/rpkid/rpki/gui/app/templates/app/roa_request_list.html b/rpkid/rpki/gui/app/templates/app/roa_request_list.html
index 024c6f7c..3bc42d91 100644
--- a/rpkid/rpki/gui/app/templates/app/roa_request_list.html
+++ b/rpkid/rpki/gui/app/templates/app/roa_request_list.html
@@ -10,17 +10,22 @@
<tr><th>Prefix</th><th>Max Length</th><th>ASN</th><th>Action</th></tr>
{% for object in object_list %}
<tr>
- <td>{{ object.as_roa_prefix }}</a></td>
- <td>{{ object.max_length }}</td>
+ <td>{{ object.prefix }}/{{ object.prefixlen }}</a></td>
+ <td>{{ object.max_prefixlen }}</td>
<td>{{ object.roa_request.asn }}</td>
<td><a class='btn danger' href="{{ object.get_absolute_url }}/delete">Delete</a></td>
</tr>
{% endfor %}
</table>
{% else %}
-None
+<div class='alert-message warning'>
+<p>You have not created any ROAs.
+</div>
{% endif %}
+<div class='actions'>
+ <a class='btn' href='{% url rpki.gui.app.views.roa_create %}'>Create</a>
+</div>
{% endblock %}
<!-- vim: set sw=2: -->
diff --git a/rpkid/rpki/gui/app/urls.py b/rpkid/rpki/gui/app/urls.py
index 68277301..abc3fadc 100644
--- a/rpkid/rpki/gui/app/urls.py
+++ b/rpkid/rpki/gui/app/urls.py
@@ -53,6 +53,7 @@ urlpatterns = patterns('',
(r'^repo/(?P<pk>\d+)$', views.repository_detail),
(r'^repo/(?P<pk>\d+)/delete$', views.repository_delete),
(r'^roa/$', views.roa_list),
+ (r'^roa/create$', views.roa_create),
(r'^roa/(?P<pk>\d+)/$', views.roa_detail),
(r'^roa/(?P<pk>\d+)/delete$', views.roa_delete),
(r'^routes/$', views.route_view),
diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py
index 72258e45..e6bc9a44 100644
--- a/rpkid/rpki/gui/app/views.py
+++ b/rpkid/rpki/gui/app/views.py
@@ -430,6 +430,10 @@ def roa_delete(request, pk):
'routes': routes }, request)
@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.