upload fix bug
This commit is contained in:
parent
b1370154da
commit
4b08a9feeb
4 changed files with 21 additions and 24 deletions
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
23
public/js/app.js
vendored
23
public/js/app.js
vendored
|
|
@ -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({
|
||||
|
|
|
|||
5
resources/js/depot.js
vendored
5
resources/js/depot.js
vendored
|
|
@ -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) {
|
||||
|
|
|
|||
15
resources/js/media.js
vendored
15
resources/js/media.js
vendored
|
|
@ -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('<img id="drTarget" src="" >');
|
||||
|
|
@ -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{
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue