From 21042114541f524b10bb1fc78bb7ba70d9617fda Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Mon, 30 Mar 2020 20:02:37 +0200 Subject: [PATCH] IE Uploaderror --- .../templates/standards/standards_add.html | 7 ++++-- .../templates/standards/standards_update.html | 23 ++++++++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/standards/templates/standards/standards_add.html b/standards/templates/standards/standards_add.html index 4328d6e..01c11d9 100644 --- a/standards/templates/standards/standards_add.html +++ b/standards/templates/standards/standards_add.html @@ -508,6 +508,9 @@ $('#uploadedfile').on('change', function() { uploadAction($("#uploadedfile")[0]['files'][0], {{parentid}}); }); +function hideUpload(){ + $("#uploadModalProgress").modal("hide"); +} function uploadAction(filetodo){ var formData = new FormData(); @@ -530,12 +533,12 @@ function uploadAction(filetodo){ success: function(data) { if(data["success"] == true){ setTimeout(function(){ - $("#uploadModalProgress").modal("toggle"); + hideUpload(); actualFiles.push(String(data["data"]["savedobj_id"])); $("#id_added_files").val(actualFiles); $("#linkedfiles") .append('' + data["data"]["savedobj_name"] + ''); }, 1000); - } + } else{ $("#forbiddenFileType").modal("toggle") } diff --git a/standards/templates/standards/standards_update.html b/standards/templates/standards/standards_update.html index b9fb008..9ccd68a 100644 --- a/standards/templates/standards/standards_update.html +++ b/standards/templates/standards/standards_update.html @@ -578,6 +578,10 @@ $('#uploadedfile').on('change', function() { uploadAction($("#uploadedfile")[0]['files'][0], {{parentid}}); }); +function hideUpload(){ + $("#uploadModalProgress").modal("hide"); +} + function uploadAction(filetodo){ var formData = new FormData(); formData.append("uploadedfile", filetodo); @@ -596,7 +600,7 @@ function uploadAction(filetodo){ beforeSend: function(){ $("#uploadModalProgress").modal("toggle"); }, - success: function(data) { + /* success: function(data) { if(data["success"] == true){ setTimeout(function(){ $("#uploadModalProgress").modal("toggle"); @@ -610,6 +614,23 @@ function uploadAction(filetodo){ }, success: function (data) {} }); + }*/ + success: function(data) + { + if(data["success"] == true){ + + $("#linkedfiles") .append('' + data["data"]["savedobj_name"] + ''); + $.ajax({ + url: "{% url 'update_standard_by_ajax' standard.pk %}", + data: { + action : 's_addfile', + fileid : data["data"]["savedobj_id"] + }, + success: function (data) { + setTimeout(function (){ hideUpload();}, 1000); + } + + }); } else{ $("#forbiddenFileType").modal("toggle")