X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=projecthandler%2Furls%2Fproject.py;h=16606072a8c40ceaea430fa124f97ed6fdddfdb6;hb=3218b2b802b040b6110780eb95cf84a9f3101505;hp=91c79c77f20c156dd444809e306cc0bd06212a79;hpb=78e7188849e9acdb565a4598dba733b69faa764f;p=osm%2FLW-UI.git

diff --git a/projecthandler/urls/project.py b/projecthandler/urls/project.py
index 91c79c7..1660607 100644
--- a/projecthandler/urls/project.py
+++ b/projecthandler/urls/project.py
@@ -21,25 +21,13 @@ urlpatterns = [
     url(r'^$', views.open_project, name='open_project'),
     url(r'^list/', views.user_projects, name='projects_list'),
     url(r'^new/', views.create_new_project, name='new_project'),
-    url(r'^(?P<project_id>\w+)/delete$', views.delete_project, name='delete_project'),
-    url(r'^(?P<project_id>\w+)/switch', views.switch_project, name='switch_project'),
-    url(r'^(?P<project_id>\w+)/edit', views.edit_project, name='edit_project'),
-    url(r'^descriptors/(?P<descriptor_type>\w+)/list$', views.show_descriptors, name='list_descriptors'),
-    url(r'^descriptors/(?P<descriptor_type>\w+)/(?P<descriptor_id>[-\w]+)(/$)',
-        views.edit_descriptor, name='edit_descriptor'),
-    url(r'^descriptors/(?P<descriptor_type>\w+)/(?P<descriptor_id>[-\w]+)/delete$',
-        views.delete_descriptor,
-        name='delete_descriptor'),
-    url(r'^descriptors/(?P<descriptor_type>\w+)/(?P<descriptor_id>[-\w]+)/clone',
-        views.clone_descriptor,
-        name='clone_descriptor'),
-    url(r'^descriptors/(?P<descriptor_type>\w+)/(?P<descriptor_id>[-\w]+)/action/(?P<action_name>[-\w]+)',
-        views.custom_action,
-        name='custom_action'),
-    url(r'^descriptors/(?P<descriptor_type>\w+)/new$', views.new_descriptor,
-        name='new_descriptor'),
-    url(r'^composer$', views.open_composer, name='open_composer'),
-    url(r'^availablenodes', views.get_available_nodes, name='get_available_nodes'),
+    url(r'^descriptors/', include('descriptorhandler.urls', namespace='descriptors'), name='descriptor_base'),
+    url(r'^(?P<project_id>[\w ]+)/delete$', views.delete_project, name='delete_project'),
+    url(r'^(?P<project_id>[\w ]+)/switch', views.switch_project, name='switch_project'),
+    url(r'^(?P<project_id>[\w ]+)/edit', views.edit_project, name='edit_project'),
+
+
+
 
 
 ]
\ No newline at end of file