commiting work in progress

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

1 files changed, 15 insertions, 19 deletions

diff --git a/rpkid/rpki/gui/app/urls.py b/rpkid/rpki/gui/app/urls.py
index 7e2e9878..aa6a9043 100644
--- a/rpkid/rpki/gui/app/urls.py
+++ b/rpkid/rpki/gui/app/urls.py
@@ -23,45 +23,41 @@ urlpatterns = patterns('',
     (r'^conf/export$', views.conf_export),
     (r'^conf/list$', views.conf_list),
     (r'^conf/select$', views.conf_select),
-    (r'^parent/$', views.parent_list),
     (r'^parent/import$', views.parent_import),
-    (r'^parent/(?P<pk>\d+)$', views.parent_detail),
+    (r'^parent/(?P<pk>\d+)/$', views.parent_detail),
     (r'^parent/(?P<pk>\d+)/delete$', views.parent_delete),
     (r'^parent/(?P<pk>\d+)/export$', views.parent_export),
-    (r'^child/$', views.child_list),
     (r'^child/import$', views.child_import),
-    (r'^child/(?P<pk>\d+)$', views.child_view),
+    (r'^child/(?P<pk>\d+)/$', views.child_view),
     (r'^child/(?P<pk>\d+)/add_asn/$', views.child_add_asn),
     (r'^child/(?P<pk>\d+)/add_address/$', views.child_add_address),
     (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),
-    (r'^gbr/$', views.ghostbuster_list),
-    (r'^gbr/create$', views.ghostbuster_create),
-    (r'^gbr/(?P<pk>\d+)$', views.ghostbuster_view),
-    (r'^gbr/(?P<pk>\d+)/edit$', views.ghostbuster_edit),
-    (r'^gbr/(?P<pk>\d+)/delete$', views.ghostbuster_delete),
+    url(r'^gbr/create$',
+        views.handle_required(views.GhostbusterCreateView.as_view()),
+        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+)/delete$', views.GhostbusterDeleteView.as_view(), name='gbr-delete'),
     (r'^refresh$', views.refresh),
-    (r'^client/$', views.client_list),
     (r'^client/import$', views.client_import),
-    (r'^client/(?P<pk>\d+)$', views.client_detail),
+    (r'^client/(?P<pk>\d+)/$', views.client_detail),
     (r'^client/(?P<pk>\d+)/delete$', views.client_delete),
     (r'^client/(?P<pk>\d+)/export$', views.client_export),
-    (r'^repo/$', views.repository_list),
     (r'^repo/import$', views.repository_import),
-    (r'^repo/(?P<pk>\d+)$', views.repository_detail),
+    (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/confirm$', views.roa_create_confirm),
-    (r'^roa/(?P<pk>\d+)$', views.roa_detail),
+    (r'^roa/(?P<pk>\d+)/$', views.roa_detail),
     (r'^roa/(?P<pk>\d+)/delete$', views.roa_delete),
-    (r'^routes/$', views.route_view),
-    (r'^routes/(?P<pk>\d+)$', views.route_detail),
-    (r'^routes/(?P<pk>\d+)/roa/$', views.route_roa_list),
+    (r'^route/$', views.route_view),
+    (r'^route/(?P<pk>\d+)/$', views.route_detail),
+    (r'^route/(?P<pk>\d+)/roa/$', views.route_roa_list),
     (r'^user/$', views.user_list),
     (r'^user/create$', views.user_create),
-    (r'^user/(?P<pk>\d+)$', views.user_detail),
+    (r'^user/(?P<pk>\d+)/$', views.user_detail),
     (r'^user/(?P<pk>\d+)/delete$', views.user_delete),
     (r'^user/(?P<pk>\d+)/edit$', views.user_edit),
 )