From 35dde05527969c05ba45eddf5f672fc0163c4faa Mon Sep 17 00:00:00 2001 From: lombardof Date: Wed, 23 May 2018 14:45:12 +0200 Subject: [PATCH] fix ui onboarding problem Change-Id: Ifaf576dea73d50a30404114a6c80c3367b64afc7 Signed-off-by: lombardof --- .../osm/descriptor/descriptor_new.html | 118 +++++++++--------- projecthandler/views.py | 11 +- 2 files changed, 58 insertions(+), 71 deletions(-) diff --git a/projecthandler/template/project/osm/descriptor/descriptor_new.html b/projecthandler/template/project/osm/descriptor/descriptor_new.html index eb1e127..762d931 100644 --- a/projecthandler/template/project/osm/descriptor/descriptor_new.html +++ b/projecthandler/template/project/osm/descriptor/descriptor_new.html @@ -50,88 +50,84 @@ Onboard new {{ descriptor_type }} package {{ block.super }} {% endblock %} diff --git a/projecthandler/views.py b/projecthandler/views.py index cd10806..a03ae44 100644 --- a/projecthandler/views.py +++ b/projecthandler/views.py @@ -265,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) -- 2.25.1