From: lombardofr Date: Wed, 18 Jul 2018 07:47:28 +0000 (+0200) Subject: refactoring urls X-Git-Tag: BUILD_v4.0.1_1~8 X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FLW-UI.git;a=commitdiff_plain;h=2ad37de399d1f309e265c060349ce44f80d8f480 refactoring urls Change-Id: If7c9bbfec35f733b3154fd74d83794764f4dad44 Signed-off-by: lombardofr --- diff --git a/instancehandler/template/instance_list.html b/instancehandler/template/instance_list.html index 5888519..5471c19 100644 --- a/instancehandler/template/instance_list.html +++ b/instancehandler/template/instance_list.html @@ -25,7 +25,7 @@ {% block breadcrumb_body %} {{ block.super }} -
  • {{ type|upper }} Instances
    • +
  • {{ type|upper }} Instances
    • {% endblock %} {% block content_body %} diff --git a/instancehandler/template/instance_list_ns.html b/instancehandler/template/instance_list_ns.html index 2da870d..2481d87 100644 --- a/instancehandler/template/instance_list_ns.html +++ b/instancehandler/template/instance_list_ns.html @@ -7,7 +7,7 @@ @@ -58,20 +58,20 @@
    @@ -80,21 +80,21 @@ diff --git a/instancehandler/template/instance_list_vnf.html b/instancehandler/template/instance_list_vnf.html index 410fcb0..b8fd9cc 100644 --- a/instancehandler/template/instance_list_vnf.html +++ b/instancehandler/template/instance_list_vnf.html @@ -37,7 +37,7 @@
    diff --git a/instancehandler/template/instance_operations_list.html b/instancehandler/template/instance_operations_list.html index e72b56c..55c097b 100644 --- a/instancehandler/template/instance_operations_list.html +++ b/instancehandler/template/instance_operations_list.html @@ -25,7 +25,7 @@ {% block breadcrumb_body %} {{ block.super }} -
  • Instances
    • +
  • Instances
    • {% endblock %} {% block content_body %} @@ -74,7 +74,7 @@
    diff --git a/instancehandler/template/instance_topology_view.html b/instancehandler/template/instance_topology_view.html index 627770d..fb67fbc 100644 --- a/instancehandler/template/instance_topology_view.html +++ b/instancehandler/template/instance_topology_view.html @@ -24,7 +24,7 @@ {% block breadcrumb_body %} {{ block.super }} -
  • {{ type|upper }} Instances
    • +
  • {{ type|upper }} Instances
  • {{ type|upper }} Topology
    • {% endblock %} diff --git a/instancehandler/template/modal/instance_create.html b/instancehandler/template/modal/instance_create.html index 384e782..a776697 100644 --- a/instancehandler/template/modal/instance_create.html +++ b/instancehandler/template/modal/instance_create.html @@ -6,7 +6,7 @@

    New Instance

    -
    {% csrf_token %} diff --git a/instancehandler/views.py b/instancehandler/views.py index 2148b7b..149b9c1 100644 --- a/instancehandler/views.py +++ b/instancehandler/views.py @@ -78,7 +78,7 @@ def create(request): user = osmutils.get_user(request) client = Client() result = client.ns_create(user.get_token(), ns_data) - return __response_handler(request, result, 'projects:instances:list', to_redirect=True, type='ns', + return __response_handler(request, result, 'instances:list', to_redirect=True, type='ns', ) @@ -132,7 +132,7 @@ def delete(request, instance_id=None, type=None): client = Client() result = client.ns_delete(user.get_token(), instance_id, force) print result - return __response_handler(request, result, 'projects:instances:list', to_redirect=True, type='ns', + return __response_handler(request, result, 'instances:list', to_redirect=True, type='ns', ) diff --git a/projecthandler/template/project/osm/descriptor/descriptorlist.html b/projecthandler/template/project/osm/descriptor/descriptorlist.html index c995844..ee3eaa7 100644 --- a/projecthandler/template/project/osm/descriptor/descriptorlist.html +++ b/projecthandler/template/project/osm/descriptor/descriptorlist.html @@ -42,7 +42,7 @@ {% if descriptor_type == "nsd" %} {% endif %}
    - Open list Open list
    @@ -71,7 +71,7 @@

    {{ project_overview.vnf }}

    VNF Instances

    - Open list Open list diff --git a/projecthandler/template/project/osm/osm_project_left_sidebar.html b/projecthandler/template/project/osm/osm_project_left_sidebar.html index b07c432..82becc5 100644 --- a/projecthandler/template/project/osm/osm_project_left_sidebar.html +++ b/projecthandler/template/project/osm/osm_project_left_sidebar.html @@ -38,8 +38,8 @@ - {% url "projects:instances:list" type='ns' as instance_ns_list_url %} - {% url "projects:instances:list" type='vnf' as instance_vnf_list_url %} + {% url "instances:list" type='ns' as instance_ns_list_url %} + {% url "instances:list" type='vnf' as instance_vnf_list_url %}
  • @@ -49,32 +49,32 @@
      - {% url "projects:instances:list" type='ns' as instance_ns_list_url %} + {% url "instances:list" type='ns' as instance_ns_list_url %}
    • - + NS Instances
      • - {% url "projects:instances:list" type='vnf' as instance_vnf_list_url %} + {% url "instances:list" type='vnf' as instance_vnf_list_url %}
    • - + VNF Instances
    • - {% url "projects:sdns:list" as sdn_list_url %} + {% url "sdns:list" as sdn_list_url %}
  • - + SDN Controllers
    • - {% url "projects:vims:list" as vim_list_url %} + {% url "vims:list" as vim_list_url %}
  • - + VIM Accounts
    • diff --git a/projecthandler/urls/project.py b/projecthandler/urls/project.py index 1e3b24e..e0395c8 100644 --- a/projecthandler/urls/project.py +++ b/projecthandler/urls/project.py @@ -36,8 +36,6 @@ urlpatterns = [ 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'^sdn/', include('sdnctrlhandler.urls', namespace='sdns'), name='sdns_base'), - url(r'^vims/', include('vimhandler.urls', namespace='vims'), name='vims_base'), - url(r'^instances/', include('instancehandler.urls', namespace='instances'), name='instances_base'), + ] \ No newline at end of file diff --git a/sdnctrlhandler/template/sdn_create.html b/sdnctrlhandler/template/sdn_create.html index 75d010d..cd912bc 100644 --- a/sdnctrlhandler/template/sdn_create.html +++ b/sdnctrlhandler/template/sdn_create.html @@ -19,7 +19,7 @@ {% block breadcrumb_body %} {{ block.super }} -
  • SDN Controllers
    • +
  • SDN Controllers
    • {% endblock %} {% block content_body %} @@ -27,7 +27,7 @@
    - + {% csrf_token %}
    @@ -120,7 +120,7 @@
    - diff --git a/sdnctrlhandler/template/sdn_list.html b/sdnctrlhandler/template/sdn_list.html index acb73d1..627278c 100644 --- a/sdnctrlhandler/template/sdn_list.html +++ b/sdnctrlhandler/template/sdn_list.html @@ -17,7 +17,7 @@ {% block breadcrumb_body %} {{ block.super }} -
  • SDN Controllers
    • +
  • SDN Controllers
    • {% endblock %} {% block content_body %} @@ -31,7 +31,7 @@

    Registered SDN Controllers

    - New SDN Controller
    diff --git a/sdnctrlhandler/views.py b/sdnctrlhandler/views.py index 26488ce..aa89a59 100644 --- a/sdnctrlhandler/views.py +++ b/sdnctrlhandler/views.py @@ -63,7 +63,7 @@ def create(request): result = client.sdn_create(user.get_token(), sdn_data) - return __response_handler(request, result, 'projects:sdns:list', to_redirect=True, ) + return __response_handler(request, result, 'sdns:list', to_redirect=True, ) @login_required @@ -75,7 +75,7 @@ def delete(request, sdn_id=None): del_res = client.sdn_delete(user.get_token(), sdn_id) except Exception as e: log.exception(e) - return __response_handler(request, {}, 'projects:sdns:list', to_redirect=True, ) + return __response_handler(request, {}, 'sdns:list', to_redirect=True, ) @login_required diff --git a/sf_t3d/urls.py b/sf_t3d/urls.py index 4902f8d..ea95716 100644 --- a/sf_t3d/urls.py +++ b/sf_t3d/urls.py @@ -21,14 +21,14 @@ from sf_t3d import views app_name = 'base' urlpatterns = [ - #url(r'^admin/', admin.site.urls), - url(r'^auth/$', user_views.user_login, name='auth_user'), - #url(r'^register', user_views.register_view, name='register_user'), - url(r'^projects/', include('projecthandler.urls.project', namespace='projects'), name='projects_base'), - url(r'^users/', include('userhandler.urls', namespace='users'), name='users_base'), - url(r'^$', views.home, name='home'), url(r'^home', views.home, name='home'), + url(r'^auth/$', user_views.user_login, name='auth_user'), + url(r'^projects/', include('projecthandler.urls.project', namespace='projects'), name='projects_base'), + url(r'^sdn/', include('sdnctrlhandler.urls', namespace='sdns'), name='sdns_base'), + url(r'^vims/', include('vimhandler.urls', namespace='vims'), name='vims_base'), + url(r'^instances/', include('instancehandler.urls', namespace='instances'), name='instances_base'), + url(r'^admin/users/', include('userhandler.urls', namespace='users'), name='users_base'), url(r'^forbidden', views.forbidden, name='forbidden'), ] diff --git a/static/src/sdnctrlhandler/sdn_list.js b/static/src/sdnctrlhandler/sdn_list.js index 606da3a..9da94be 100644 --- a/static/src/sdnctrlhandler/sdn_list.js +++ b/static/src/sdnctrlhandler/sdn_list.js @@ -1,7 +1,7 @@ function deleteSDN(sdn_uuid) { bootbox.confirm("Are you sure want to delete?", function (result) { if (result) { - location.href = '/projects/sdn/' + sdn_uuid + '/delete' + location.href = '/sdn/' + sdn_uuid + '/delete' } }) } @@ -13,7 +13,7 @@ function showSDN(sdn_uuid) { }); $.ajax({ - url: '/projects/sdn/' + sdn_uuid , + url: '/sdn/' + sdn_uuid , //url: '/sdn/' + sdn_uuid, type: 'GET', dataType: "json", diff --git a/static/src/userhandler/user_list.js b/static/src/userhandler/user_list.js index 196b878..282c314 100644 --- a/static/src/userhandler/user_list.js +++ b/static/src/userhandler/user_list.js @@ -23,8 +23,6 @@ function openModalCreateUser(args) { } }); - - $('#modal_new_user').modal('show'); } diff --git a/vimhandler/template/vim_create.html b/vimhandler/template/vim_create.html index 187dc87..f7f91a2 100644 --- a/vimhandler/template/vim_create.html +++ b/vimhandler/template/vim_create.html @@ -19,7 +19,7 @@ {% block breadcrumb_body %} {{ block.super }} -
  • VIMS
    • +
  • VIMS
    • {% endblock %} {% block content_body %} @@ -27,7 +27,7 @@
    - + {% csrf_token %}
    @@ -175,7 +175,7 @@
    - diff --git a/vimhandler/template/vim_list.html b/vimhandler/template/vim_list.html index 535f4db..d1b9545 100644 --- a/vimhandler/template/vim_list.html +++ b/vimhandler/template/vim_list.html @@ -19,7 +19,7 @@ {% block breadcrumb_body %} {{ block.super }} -
  • VIMS
    • +
  • VIMS
    • {% endblock %} {% block content_body %} @@ -33,7 +33,7 @@

    Registered VIM

    - New VIM
    @@ -64,10 +64,10 @@
    diff --git a/vimhandler/template/vim_show.html b/vimhandler/template/vim_show.html index 13613de..38f2700 100644 --- a/vimhandler/template/vim_show.html +++ b/vimhandler/template/vim_show.html @@ -18,7 +18,7 @@ {% block breadcrumb_body %} {{ block.super }} -
  • VIMS
    • +
  • VIMS
    • {% endblock %} {% block content_body %} @@ -121,7 +121,7 @@
    - +
    diff --git a/vimhandler/views.py b/vimhandler/views.py index bf88c11..d41ff82 100644 --- a/vimhandler/views.py +++ b/vimhandler/views.py @@ -76,7 +76,7 @@ def create(request): print e result = client.vim_create(user.get_token(), vim_data) # TODO 'vim:show', to_redirect=True, vim_id=vim_id - return __response_handler(request, result, 'projects:vims:list', to_redirect=True, ) + return __response_handler(request, result, 'vims:list', to_redirect=True, ) @login_required def delete(request, vim_id=None): @@ -86,7 +86,7 @@ def delete(request, vim_id=None): del_res = client.vim_delete(user.get_token(), vim_id) except Exception as e: log.exception(e) - return __response_handler(request, {}, 'projects:vims:list', to_redirect=True, ) + return __response_handler(request, {}, 'vims:list', to_redirect=True, ) @login_required def show(request, vim_id=None):