X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FLW-UI.git;a=blobdiff_plain;f=projecthandler%2Fviews.py;h=fad83bda89bb103874424d14fbb203158901ff98;hp=6a9a98a342c2f23549d38419161342cf276a8e24;hb=8682da66abd437a360852489fcfefe8b384f9c1f;hpb=3218b2b802b040b6110780eb95cf84a9f3101505 diff --git a/projecthandler/views.py b/projecthandler/views.py index 6a9a98a..fad83bd 100644 --- a/projecthandler/views.py +++ b/projecthandler/views.py @@ -58,7 +58,7 @@ def user_projects(request): user = osmutils.get_user(request) client = Client() result = client.project_list(user.get_token()) - return __response_handler(request,{ + return __response_handler(request, { 'projects': result['data'] if result and result['error'] is False else [], },'projectlist.html') @@ -75,11 +75,12 @@ def open_project(request): vnfd = client.vnfd_list(user.get_token()) ns = client.ns_list(user.get_token()) vnf = client.vnf_list(user.get_token()) + proj_data_admin = prj['data']['_admin'] if prj and prj['error'] is False and prj['data'] and prj['data']['_admin'] else None project_overview = { 'owner': user.username, - 'name': project_id, - 'updated_date': prj['data']['_admin']['modified'] if prj and prj['error'] is False else '-', - 'created_date': prj['data']['_admin']['created'] if prj and prj['error'] is False else '-', + 'name': user.project_name, + 'updated_date': proj_data_admin['modified'] if proj_data_admin else '-', + 'created_date': proj_data_admin['created'] if proj_data_admin else '-', 'type': 'osm', 'nsd': len(nsd['data']) if nsd and nsd['error'] is False else 0, @@ -130,9 +131,6 @@ def edit_project(request, project_id): return __response_handler(request, {}, url=None, status=200) - - - def __response_handler(request, data_res, url=None, to_redirect=None, *args, **kwargs): raw_content_types = request.META.get('HTTP_ACCEPT', '*/*').split(',') if 'application/json' in raw_content_types or url is None: