X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=sdnctrlhandler%2Fviews.py;h=52be0a484d6e72d8d0e4dd21251195accea4987b;hb=70f9629aef040ce2bd6fba9c082f15d33ac00ef1;hp=26488ce7c131c86e35140f80ccfebf71406328c5;hpb=99f922f1dc8623a444930a621ce3696802d619c0;p=osm%2FLW-UI.git diff --git a/sdnctrlhandler/views.py b/sdnctrlhandler/views.py index 26488ce..52be0a4 100644 --- a/sdnctrlhandler/views.py +++ b/sdnctrlhandler/views.py @@ -15,7 +15,7 @@ # from django.shortcuts import render, redirect -from django.contrib.auth.decorators import login_required +from sf_t3d.decorators import login_required from django.http import HttpResponse import json import logging @@ -30,13 +30,15 @@ log = logging.getLogger('sdnctrlhandler/view.py') def list(request): user = osmutils.get_user(request) project_id = user.project_id + result = {'project_id': project_id} + raw_content_types = request.META.get('HTTP_ACCEPT', '*/*').split(',') + if 'application/json' not in raw_content_types: + return __response_handler(request, result, 'sdn_list.html') client = Client() - result = client.sdn_list(user.get_token()) + result_client = client.sdn_list(user.get_token()) + + result['sdns'] = result_client['data'] if result_client and result_client['error'] is False else [] - result = { - 'project_id': project_id, - 'sdns': result['data'] if result and result['error'] is False else [] - } return __response_handler(request, result, 'sdn_list.html') @@ -63,7 +65,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 +77,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, del_res, 'sdns:list', to_redirect=True, ) @login_required