VNF and NS instances in the left panel under Instancese

[osm/LW-UI.git] / projecthandler / views.py

diff --git a/projecthandler/views.py b/projecthandler/views.py
index 8c553a4..a03ae44 100644 (file)
--- a/projecthandler/views.py
+++ b/projecthandler/views.py
@@ -166,7 +166,6 @@ def delete_project(request, project_id=None):
             return render(request, 'error.html', {'error_msg': 'Project not found.'})
 
 
-
 @login_required
 def show_descriptors(request, project_id=None, descriptor_type=None):
     csrf_token_value = get_token(request)
@@ -174,16 +173,15 @@ def show_descriptors(request, project_id=None, descriptor_type=None):
     project_overview = projects[0].get_overview_data()
     prj_token = project_overview['type']
 
-    page = prj_token + '/' + prj_token + '_project_descriptors.html'
-
-    return render(request, page, {
+    url = prj_token + '/' + prj_token + '_project_descriptors.html'
+    return __response_handler(request, {
         'descriptors': projects[0].get_descriptors(descriptor_type),
         'project_id': project_id,
         'project_type': prj_token,
         'project_overview_data': project_overview,
         "csrf_token_value": csrf_token_value,
         'descriptor_type': descriptor_type
-    })
+    },url)
 
 
 @login_required
@@ -267,20 +265,11 @@ def new_descriptor(request, project_id=None, descriptor_type=None):
     page = prj_token + '/descriptor/descriptor_new.html'
     if request.method == 'GET':
         request_id = request.GET.get('id', '')
-
-        json_template = projects[0].get_new_descriptor(descriptor_type, request_id)
-        print 'new descriptor GET', json_template
-
-        descriptor_string_yaml = Util.json2yaml(json_template)
-        descriptor_string_json = json.dumps(json_template)
-
         return render(request, page, {
             'project_id': project_id,
             'descriptor_type': descriptor_type,
             'descriptor_id': request_id,
-            'project_overview_data': project_overview,
-            'descriptor_strings': {'descriptor_string_yaml': descriptor_string_yaml,
-                                   'descriptor_string_json': descriptor_string_json}
+            'project_overview_data': project_overview
         })
     elif request.method == 'POST':
         csrf_token_value = get_token(request)