From 4b08a9feeb9a426aa6c6fb7f9286f338e2abc055 Mon Sep 17 00:00:00 2001 From: Yann Gonidec Date: Thu, 18 Jul 2019 11:23:06 +0200 Subject: [PATCH] upload fix bug --- app/Http/Controllers/DossierController.php | 2 +- public/js/app.js | 23 ++++++++++------------ resources/js/depot.js | 5 ++++- resources/js/media.js | 15 ++++++-------- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/app/Http/Controllers/DossierController.php b/app/Http/Controllers/DossierController.php index 828f79e..593d106 100644 --- a/app/Http/Controllers/DossierController.php +++ b/app/Http/Controllers/DossierController.php @@ -295,7 +295,7 @@ class DossierController extends Controller $dossier = Dossier::where('id', $dossier_id)->first(); if($dossier && !is_null($dossier->parent_id)){ if ($dossier->delete()) { - return json_encode(true); + return json_encode($dossier->parent_id); } } diff --git a/public/js/app.js b/public/js/app.js index 1479a93..e2d0241 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -11113,6 +11113,7 @@ $(document).ready(function () { return false; } + $("#submit").css("pointer-events", "none"); var currentdate = new Date(); folderName = $("#depot_societe").val().replace(' ', '_') + "_" + currentdate.getFullYear().toString() + ("0" + (currentdate.getMonth() + 1)).slice(-2) + currentdate.getDate().toString() + "_" + currentdate.getHours().toString() + currentdate.getMinutes().toString() + currentdate.getSeconds().toString(); var description = "Nom : " + $("#depot_nom").val() + '\n' + "Société : " + $("#depot_societe").val() + '\n' + $("#depot_description").val(); // création d'un dossier de dépôt @@ -11143,7 +11144,7 @@ $(document).ready(function () { $(this).stop().fadeOut("fast"); }); var currentfiles = []; - var maxFiles = 20; + var maxFiles = 100; var counter = 0; $('#uploadDepot').fileupload({ url: "/ajax/upload-media", @@ -11242,6 +11243,7 @@ $(document).ready(function () { message: "Le transfert des fichiers est terminé !", type: "info" }); + $("#submit").css("pointer-events", "auto"); }, fail: function fail(e, data) { $.each(data.files, function (index, file) { @@ -11451,7 +11453,7 @@ $(document).ready(function () { $(".folder_container .loader").show(); var $countCurrentFolder = $(".folder_container .dd3-item[data-id='" + dossier_id + "'] > .dd3-content .count").html(); - if (!$('.dd .dd-item[data-id="' + dossier_id + '"] > ol').length && $(window).data('currentFolder') == 0) { + if (!$('.dd .dd-item[data-id="' + dossier_id + '"] > ol').length && $countCurrentFolder == 0) { $.ajax({ url: '/ajax/remove-folder', method: 'POST', @@ -11459,9 +11461,10 @@ $(document).ready(function () { data: { dossier_id: dossier_id }, - success: function success(result) { + success: function success(currentFolder) { // supprimer dossier - if (result == true) { + if (currentFolder) { + $('.dd .dd-item[data-id="' + currentFolder + '"] > .dd3-content').trigger("click"); $('.dd').nestable('remove', dossier_id); } else { $.fancyMessage({ @@ -11925,15 +11928,10 @@ $(document).ready(function () { } // ---- Gestion de la retouche - console.log($(this).attr('data-ext')); - console.log(jQuery.inArray($(this).attr('data-ext'), ['gif', 'psd', 'ai', 'pdf'])); - if (jQuery.inArray($(this).attr('data-ext'), ['gif', 'psd', 'ai', 'pdf']) != -1) { - console.log("masque retouche"); // masque l'onglet retouche - + // masque l'onglet retouche $("#form_media .form_media_retouch").hide(); } else { - console.log("affiche retouche"); $("#form_media .form_media_retouch").show(); // on active l'onglet retouche // charge l'image pour la retouche @@ -12272,8 +12270,6 @@ $(document).ready(function () { var elems = []; } - console.log(elems); - if (jQuery.inArray(String(article.id), elems) == -1) { // maj de la valeur du champ hidden elems.push(String(article.id)); @@ -12529,6 +12525,7 @@ $(document).ready(function () { return false; } + $("#submit").css("pointer-events", "none"); $("#upload_errors").html(""); $('.upload').click(); //click upload buttons and upload all files in the queue }); @@ -12647,6 +12644,7 @@ $(document).ready(function () { $('.upload_container').hide("fast"); var currentFolder = $(window).data('currentFolder'); $(".reinit_search_btn").trigger("click"); + $("#submit").css("pointer-events", "auto"); }, fail: function fail(e, data) { $.each(data.files, function (index, file) { @@ -12946,7 +12944,6 @@ function removeMedias(medias) { if (result.length != medias.length) { $.fancybox.close(); - console.log(medias.length); if (medias.length == 1) { $.fancyMessage({ diff --git a/resources/js/depot.js b/resources/js/depot.js index e673ad7..c43f26d 100644 --- a/resources/js/depot.js +++ b/resources/js/depot.js @@ -33,6 +33,8 @@ $(document).ready(function() { return false; } + $("#submit").css("pointer-events", "none"); + var currentdate = new Date(); folderName = $("#depot_societe").val().replace(' ', '_')+"_"+currentdate.getFullYear().toString()+("0" +(currentdate.getMonth()+1)).slice(-2)+currentdate.getDate().toString()+"_"+currentdate.getHours().toString()+currentdate.getMinutes().toString()+ currentdate.getSeconds().toString(); var description = "Nom : "+$("#depot_nom").val()+'\n'+"Société : "+$("#depot_societe").val()+'\n'+$("#depot_description").val(); @@ -67,7 +69,7 @@ $(document).ready(function() { }); var currentfiles = []; - var maxFiles = 20; + var maxFiles = 100; var counter = 0; $('#uploadDepot').fileupload({ url: "/ajax/upload-media", @@ -155,6 +157,7 @@ $(document).ready(function() { $("#depot_societe").val(''); $("#depot_description").val(''); $.fancyMessage({title : "Dépôt de médias", message : "Le transfert des fichiers est terminé !", type : "info"}); + $("#submit").css("pointer-events", "auto"); }, fail: function (e, data) { $.each(data.files, function (index, file) { diff --git a/resources/js/media.js b/resources/js/media.js index 5baf9a3..640a197 100644 --- a/resources/js/media.js +++ b/resources/js/media.js @@ -186,7 +186,7 @@ $(document).ready(function() { $(".folder_container .loader").show(); var $countCurrentFolder = $(".folder_container .dd3-item[data-id='"+dossier_id+"'] > .dd3-content .count").html(); - if(!$('.dd .dd-item[data-id="'+dossier_id+'"] > ol').length && $(window).data('currentFolder') == 0){ + if(!$('.dd .dd-item[data-id="'+dossier_id+'"] > ol').length && $countCurrentFolder == 0){ $.ajax({ url: '/ajax/remove-folder', method: 'POST', @@ -194,9 +194,10 @@ $(document).ready(function() { data: { dossier_id: dossier_id, }, - success: function(result){ + success: function(currentFolder){ // supprimer dossier - if(result == true){ + if(currentFolder){ + $('.dd .dd-item[data-id="'+currentFolder+'"] > .dd3-content').trigger("click"); $('.dd').nestable('remove', dossier_id); }else{ $.fancyMessage({title : "Attention", message : "Erreur lors de la suppression du dossier. Merci d'actualiser la page.", type : "error"}); @@ -628,14 +629,10 @@ $(document).ready(function() { } // ---- Gestion de la retouche - console.log($(this).attr('data-ext')); - console.log(jQuery.inArray($(this).attr('data-ext'), [ 'gif', 'psd', 'ai', 'pdf'])); if(jQuery.inArray($(this).attr('data-ext'), [ 'gif', 'psd', 'ai', 'pdf']) != -1){ - console.log("masque retouche"); // masque l'onglet retouche $("#form_media .form_media_retouch").hide(); }else{ - console.log("affiche retouche"); $("#form_media .form_media_retouch").show(); // on active l'onglet retouche // charge l'image pour la retouche $("#form_media .tab_retouch").html(''); @@ -936,7 +933,6 @@ $(document).ready(function() { }else{ var elems = []; } - console.log(elems); if(jQuery.inArray(String(article.id), elems) == -1){ // maj de la valeur du champ hidden elems.push(String(article.id)); @@ -1173,6 +1169,7 @@ $(document).ready(function() { $.fancyMessage({title : "Ajout de média", message : "Pour ajouter des médias, veuillez d'abord sélectionner un dossier de destination.", type : "error"}); return false; } + $("#submit").css("pointer-events", "none"); $("#upload_errors").html(""); $('.upload').click() //click upload buttons and upload all files in the queue }); @@ -1283,6 +1280,7 @@ $(document).ready(function() { $('.upload_container').hide("fast"); var currentFolder = $(window).data('currentFolder'); $(".reinit_search_btn").trigger("click"); + $("#submit").css("pointer-events", "auto"); }, fail: function (e, data) { $.each(data.files, function (index, file) { @@ -1562,7 +1560,6 @@ function removeMedias(medias){ if(result.length != medias.length){ $.fancybox.close(); - console.log(medias.length); if(medias.length == 1){ $.fancyMessage({title : "Attention", message : "Ce média est lié à Arcadia. Suppression refusée. ", type : "error"}); }else{