From 35dde05527969c05ba45eddf5f672fc0163c4faa Mon Sep 17 00:00:00 2001
From: lombardof <flombardo@cnit.it>
Date: Wed, 23 May 2018 14:45:12 +0200
Subject: [PATCH] fix ui onboarding problem

Change-Id: Ifaf576dea73d50a30404114a6c80c3367b64afc7
Signed-off-by: lombardof <flombardo@cnit.it>
---
 .../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 }}
 
 <script>
-    var descr_list_url = '{% url "projects:list_descriptors"  project_id=project_id descriptor_type=descriptor_type%}'
+    var descr_list_url = '{% url "projects:list_descriptors"  project_id=project_id descriptor_type=descriptor_type%}';
 
     var dropZone = document.getElementById('drop-zone');
-    dropZone.ondrop = function(e) {
+    dropZone.ondrop = function (e) {
         e.preventDefault();
         this.className = 'upload-drop-zone';
         create(e.dataTransfer.files, true);
-    }
+    };
 
-    dropZone.ondragover = function() {
+    dropZone.ondragover = function () {
         this.className = 'upload-drop-zone drop';
         return false;
-    }
+    };
 
-    dropZone.ondragleave = function() {
+    dropZone.ondragleave = function () {
         this.className = 'upload-drop-zone';
         return false;
-    }
-
+    };
 
 
+    function create(fs, dropzone) {
+        var id = $('.nav-tabs .active').attr('id');
+        if (dropzone) id = 'file_li';
+        var type, text;
+        var data = new FormData();
+        switch (id) {
 
-        function create(fs, dropzone){
-            var id = $('.nav-tabs .active').attr('id');
-            if (dropzone) id = 'file_li'
-            var type, text ;
-            var data = new FormData();
-            switch(id) {
+            case 'file_li':
+                type = 'file';
 
-                case 'file_li':
-                    type = 'file'
-
-                    var files = dropzone ? fs : document.getElementById('js-upload-files').files;
+                var files = dropzone ? fs : document.getElementById('js-upload-files').files;
+                if (!files || !files.length) {
+                    files = document.getElementById('drop-zone').files;
                     if (!files || !files.length) {
-                      files = document.getElementById('drop-zone').files
-                      if(!files || !files.length){
-                        alert("Seletc a file")
-                        return
-                      }
-                    }
-                    console.log(files[0])
-                    var patt1 = /\.([0-9a-z]+)(?:[\?#]|$)/i;
-                    console.log(files[0].name.match(patt1));
-                    var extension = files[0].name.substr(files[0].name.lastIndexOf('.') + 1)
-                    console.log(extension)
-                    if(!(extension == 'gz' )){
-                        alert("The file must be .tar.gz");
+                        alert("Select a file");
                         return
                     }
-
-                     data.append('file', files[0]);
-                    break;
-            }
-            data.append('csrfmiddlewaretoken','{{csrf_token}}');
-            data.append('type', type);
-            data.append('text', text);
-            data.append('id', '{{descriptor_id}}');
-            console.log(text);
-            $.ajax({
-                    url: "new",
-                    type: 'POST',
-                    data: data,
-                    cache: false,
-                    contentType: false,
-                    processData: false,
-                    success: function(result) {
-                        console.log(result)
-
-                        window.location.href=descr_list_url
-
-                    },
-                    error: function(result) {
-                        showAlert(result);
-                    }
-                });
+                }
+                console.log(files[0])
+                var patt1 = /\.([0-9a-z]+)(?:[\?#]|$)/i;
+                console.log(files[0].name.match(patt1));
+                var extension = files[0].name.substr(files[0].name.lastIndexOf('.') + 1);
+                console.log(extension);
+                if (!(extension == 'gz' )) {
+                    alert("The file must be .tar.gz");
+                    return
+                }
+
+                data.append('file', files[0]);
+                break;
         }
-
-    function cancel(id){
-        window.location.href= descr_list_url
+        data.append('csrfmiddlewaretoken', '{{csrf_token}}');
+        data.append('type', type);
+        data.append('text', text);
+        data.append('id', '{{descriptor_id}}');
+        console.log(text);
+        $.ajax({
+            url: "new",
+            type: 'POST',
+            data: data,
+            cache: false,
+            contentType: false,
+            processData: false,
+            success: function (result) {
+                console.log(result);
+
+                window.location.href = descr_list_url
+
+            },
+            error: function (result) {
+                showAlert(result);
+            }
+        });
     }
 
-
+    function cancel(id) {
+        window.location.href = descr_list_url
+    }
 
 </script>
 {% 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.17.1