Merge branch 'develop' into trunk

This commit is contained in:
Vincent BRIDIER 2022-03-31 12:43:03 +02:00
commit 2467e01e0e
No known key found for this signature in database
GPG key ID: 8571BFA20420D512
11 changed files with 158 additions and 32 deletions

22
.vscode/settings.json vendored Normal file
View file

@ -0,0 +1,22 @@
{
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#826d05",
"activityBar.activeBorder": "#07b89a",
"activityBar.background": "#826d05",
"activityBar.foreground": "#e7e7e7",
"activityBar.inactiveForeground": "#e7e7e799",
"activityBarBadge.background": "#07b89a",
"activityBarBadge.foreground": "#e7e7e7",
"sash.hoverBorder": "#826d05",
"statusBar.background": "#514403",
"statusBar.foreground": "#e7e7e7",
"statusBarItem.hoverBackground": "#826d05",
"statusBarItem.remoteBackground": "#514403",
"statusBarItem.remoteForeground": "#e7e7e7",
"titleBar.activeBackground": "#514403",
"titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#51440399",
"titleBar.inactiveForeground": "#e7e7e799"
},
"peacock.remoteColor": "#514403"
}

78
resources/js/app.js vendored
View file

@ -299,37 +299,57 @@ $.fancyConfirm = function( opts ) {
// Message
$.fancyMessage = function( opts ) {
opts = $.extend( true, {
title : 'Are you sure?',
message : '',
type : '',
}, opts || {} );
title: 'Are you sure?',
message: '',
type: '',
}, opts || {})
$.fancybox.open({
type : 'html',
src :
'<div class="fc-content '+opts.type+'">' +
'<h3>' + opts.title + '</h3><hr/>' +
'<p class="tcenter"><i class="fa fa-info-circle"></i></i><i class="fa fa-exclamation-triangle"></i>' +
opts.message + '</p>' +
'<hr/><p class="button_bar">' +
'<a data-value="0" data-fancybox-close class="btn btn-square '+
(opts.type == "error" ? 'btn-red':'')+' " >Ok</a>' +
'</p>' +
'</div>',
opts : {
animationDuration : 350,
animationEffect : 'material',
modal : false,
baseTpl :
'<div class="fancybox-container fc-container high-level" role="dialog" tabindex="-1">' +
'<div class="fancybox-bg"></div>' +
'<div class="fancybox-inner">' +
'<div class="fancybox-stage"></div>' +
'</div>' +
'</div>'
}
return $.fancybox.open({
type: 'html',
src:
'<div class="fc-content ' + opts.type + '">' +
'<h3>' + opts.title + '</h3><hr/>' +
'<p class="tcenter"><i class="fa fa-info-circle"></i></i><i class="fa fa-exclamation-triangle"></i>' +
opts.message + '</p>' +
'<hr/><p class="button_bar">' +
'<a data-value="0" data-fancybox-close class="btn btn-square ' +
(opts.type == "error" ? 'btn-red' : '') + ' " >Ok</a>' +
'</p>' +
'</div>',
opts: {
afterClose: opts.afterClose,
animationDuration: 350,
animationEffect: 'material',
modal: false,
baseTpl:
'<div class="fancybox-container fc-container high-level" role="dialog" tabindex="-1">' +
'<div class="fancybox-bg"></div>' +
'<div class="fancybox-inner">' +
'<div class="fancybox-stage"></div>' +
'</div>' +
'</div>'
}
});
}
}
if (!window.__DAM) {
window.__DAM = {}
}
if (!window.__DAM.methods) {
window.__DAM.methods = {}
}
// Session TimedOut
window.__DAM.methods.sessionTimedOut = () => {
$.fancyMessage({
title: 'Session expirée',
message: 'Vous allez devoir vous reconnecter pour continuer à utiliser le DAM',
type: 'error',
afterClose: () => {
location.reload()
}
});
}
// ---- Header : Menu utilisateur
$(".userbar").on('click',function(event) {

View file

@ -149,6 +149,10 @@
$.fancyMessage({title: "Dupliquer un média", message: response.data.error, type: "error"});
}
}).catch(error => {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
this.$loading.hide();
$.fancyMessage({title: "Dupliquer un média", message: error, type: "error"});
console.log(error);
@ -188,6 +192,10 @@
$.fancybox.close();
}).catch(error => {
$.fancybox.close();
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
$.fancyMessage({
title: "Attention",
message: "Erreur lors du changement d'étiquette, merci d'actualiser la page.",

View file

@ -103,6 +103,10 @@
}
}
}).catch(error => {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
console.log(error);
})
},
@ -151,6 +155,10 @@
type: "info"
});
}).catch(error => {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
_this2.$loading.hide();
$.fancybox.close();
$.fancyMessage({
@ -191,6 +199,10 @@
type: "info"
});
}).catch(error => {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
_this2.$loading.hide();
$.fancybox.close();
$.fancyMessage({
@ -224,6 +236,10 @@
type: "info"
});
}).catch(error => {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
_this2.$loading.hide();
$.fancybox.close();
$.fancyMessage({
@ -260,6 +276,10 @@
$.fancyMessage({title : "Attention", message : "Erreur lors de la suppression du média, merci d'actualiser la page.", type : "error"});
}
}).catch(error => {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
_this2.$loading.hide();
$.fancybox.close();
$.fancyMessage({title : "Attention", message : "Erreur lors de la suppression du média, merci d'actualiser la page.", type : "error"});
@ -287,6 +307,10 @@
});
_this2.$loading.hide();
}).catch(error => {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
_this2.$loading.hide();
console.log(error);
$.fancybox.close();

View file

@ -188,9 +188,13 @@
this.offset = this.offset + this.limit;
})
.catch(function (error) {
console.log(error);
});
.catch(function (error) {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
console.log(error);
});
},
infiniteScroll($state) {
this.loadMedias($state);

View file

@ -113,6 +113,10 @@
this.$store.state.folder = -1
}
}).catch(function (error) {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
console.log(error);
});
},
@ -165,6 +169,10 @@
}).then(response => {
_this2.initFolders();
}).catch(error => {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
$.fancyMessage({
title: "Dossiers",
message: "Une erreur est survenue, veuillez recharger la page (Ctrl + F5).",
@ -196,6 +204,10 @@
_this2.$loading.hide();
}, 1000);
}).catch(error => {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
_this2.$loading.hide();
console.log(error);
$.fancybox.close();

View file

@ -49,6 +49,10 @@
formats: response.data.formats
});
}).catch(function (error) {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
console.log(error);
});
}

View file

@ -197,6 +197,10 @@
}
}
}).catch(function (error) {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
console.log(error);
$.fancybox.close();
$.fancyMessage({
@ -227,6 +231,10 @@
$.fancyMessage({title: "Sauvegarde d'un média", message: response.data.error, type: "error"});
}
}).catch(function (error) {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
this.$loading.hide();
$.fancybox.close();
$.fancyMessage({

View file

@ -314,6 +314,10 @@
}
}
}).catch(function (error) {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
console.log(error);
$.fancybox.close();
$.fancyMessage({
@ -345,6 +349,10 @@
}
}).catch(function (error) {
$.fancybox.close();
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
$.fancyMessage({
title: "Lier un média à Arcadia",
message: "Erreur lors de l'opération, merci d'actualiser la page.",
@ -393,6 +401,10 @@
$.fancyMessage({title: "Sauvegarde d'un média", message: response.data.error, type: "error"});
}
}).catch(function (error) {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
this.$loading.hide();
$.fancybox.close();
$.fancyMessage({
@ -449,6 +461,10 @@
}
}
}).catch(function (error) {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
$.fancyMessage({
title: "Attention",
message: "Erreur lors de l'opération, merci d'actualiser la page.",

View file

@ -56,6 +56,10 @@
}).then(response => {
_this2.history = response.data.history;
}).catch(error => {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
console.log(error);
});
}

View file

@ -63,6 +63,10 @@
}).then(response => {
_this2.links = response.data.vignettes;
}).catch(error => {
if(error.response.status === 419) {
__DAM.methods.sessionTimedOut()
return;
}
console.log(error);
});
}else{