DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

IE Uploaderror

This commit is contained in:
holger.trampe 2020-03-30 20:02:37 +02:00
parent e9d3f218cc
commit 2104211454
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
standards/templates/standards/standards_add.html
View File

@ -508,6 +508,9 @@ $('#uploadedfile').on('change', function() {
uploadAction($("#uploadedfile")[0]['files'][0], {{parentid}}); uploadAction($("#uploadedfile")[0]['files'][0], {{parentid}});
}); });
function hideUpload(){
$("#uploadModalProgress").modal("hide");
}
function uploadAction(filetodo){ function uploadAction(filetodo){
var formData = new FormData(); var formData = new FormData();
@ -530,12 +533,12 @@ function uploadAction(filetodo){
success: function(data) { success: function(data) {
if(data["success"] == true){ if(data["success"] == true){
setTimeout(function(){ setTimeout(function(){
$("#uploadModalProgress").modal("toggle"); hideUpload();
actualFiles.push(String(data["data"]["savedobj_id"])); actualFiles.push(String(data["data"]["savedobj_id"]));
$("#id_added_files").val(actualFiles); $("#id_added_files").val(actualFiles);
$("#linkedfiles") .append('<tr id="fileadded_'+data["data"]["savedobj_id"]+'"><td>' + data["data"]["savedobj_name"] + '</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remFile('+data["data"]["savedobj_id"]+', \''+data["data"]["savedobj_name"]+'\')"><i class="fas fa-trash-alt"></i></button></td></tr>'); $("#linkedfiles") .append('<tr id="fileadded_'+data["data"]["savedobj_id"]+'"><td>' + data["data"]["savedobj_name"] + '</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remFile('+data["data"]["savedobj_id"]+', \''+data["data"]["savedobj_name"]+'\')"><i class="fas fa-trash-alt"></i></button></td></tr>');
}, 1000); }, 1000);
} }
else{ else{
$("#forbiddenFileType").modal("toggle") $("#forbiddenFileType").modal("toggle")
} }

23
standards/templates/standards/standards_update.html
View File

@ -578,6 +578,10 @@ $('#uploadedfile').on('change', function() {
uploadAction($("#uploadedfile")[0]['files'][0], {{parentid}}); uploadAction($("#uploadedfile")[0]['files'][0], {{parentid}});
}); });
function hideUpload(){
$("#uploadModalProgress").modal("hide");
}
function uploadAction(filetodo){ function uploadAction(filetodo){
var formData = new FormData(); var formData = new FormData();
formData.append("uploadedfile", filetodo); formData.append("uploadedfile", filetodo);
@ -596,7 +600,7 @@ function uploadAction(filetodo){
beforeSend: function(){ beforeSend: function(){
$("#uploadModalProgress").modal("toggle"); $("#uploadModalProgress").modal("toggle");
}, },
success: function(data) { /* success: function(data) {
if(data["success"] == true){ if(data["success"] == true){
setTimeout(function(){ setTimeout(function(){
$("#uploadModalProgress").modal("toggle"); $("#uploadModalProgress").modal("toggle");
@ -610,6 +614,23 @@ function uploadAction(filetodo){
}, },
success: function (data) {} success: function (data) {}
}); });
}*/
success: function(data)
{
if(data["success"] == true){
$("#linkedfiles") .append('<tr id="fileadded_'+data["data"]["savedobj_id"]+'"><td>' + data["data"]["savedobj_name"] + '</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remFile('+data["data"]["savedobj_id"]+', \''+data["data"]["savedobj_name"]+'\')"><i class="fas fa-trash-alt"></i></button></td></tr>');
$.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{ else{
$("#forbiddenFileType").modal("toggle") $("#forbiddenFileType").modal("toggle")