rewrite ghostbuster_{create,edit} not to use generic views

make sure to set the .vcard field when saving a ghostbuster request

display the list of covering ROAs from the rcynic cache in the route detail view

rename route_roa_list to route_detail

remove the delete button from the object_detail.html template since not all objects that use it can be deleted

set STATIC_ROOT in settings.py so that collectstatic works

svn path=/branches/tk329/; revision=4901

1 files changed, 3 insertions, 5 deletions

diff --git a/rpkid/rpki/gui/app/urls.py b/rpkid/rpki/gui/app/urls.py
index c8dfaf1f..570ed7bb 100644
--- a/rpkid/rpki/gui/app/urls.py
+++ b/rpkid/rpki/gui/app/urls.py
@@ -35,11 +35,9 @@ urlpatterns = patterns(
     (r'^child/(?P<pk>\d+)/delete$', views.child_delete),
     (r'^child/(?P<pk>\d+)/edit$', views.child_edit),
     (r'^child/(?P<pk>\d+)/export$', views.child_response),
-    url(r'^gbr/create$',
-        views.handle_required(views.GhostbusterCreateView.as_view()),
-        name='gbr-create'),
+    url(r'^gbr/create$', views.ghostbuster_create, name='gbr-create'),
     url(r'^gbr/(?P<pk>\d+)/$', views.GhostbusterDetailView.as_view(), name='gbr-detail'),
-    url(r'^gbr/(?P<pk>\d+)/edit$', views.GhostbusterEditView.as_view(), name='gbr-edit'),
+    url(r'^gbr/(?P<pk>\d+)/edit$', views.ghostbuster_edit, name='gbr-edit'),
     url(r'^gbr/(?P<pk>\d+)/delete$', views.GhostbusterDeleteView.as_view(), name='gbr-delete'),
     (r'^refresh$', views.refresh),
     (r'^client/import$', views.client_import),
@@ -54,7 +52,7 @@ urlpatterns = patterns(
     (r'^roa/confirm$', views.roa_create_confirm),
     (r'^roa/(?P<pk>\d+)/delete$', views.roa_delete),
     (r'^route/$', views.route_view),
-    (r'^route/(?P<pk>\d+)/roa/$', views.route_roa_list),
+    (r'^route/(?P<pk>\d+)/$', views.route_detail),
     (r'^user/$', views.user_list),
     (r'^user/create$', views.user_create),
     (r'^user/(?P<pk>\d+)/delete$', views.user_delete),