Loading js/Client/flashMessenger.js +3 −3 Changes for js/Client/flashMessenger.js: 3 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -39,8 +39,8 @@ function toast(message, severity) { toast.setAttribute('aria-live', 'assertive'); toast.setAttribute('aria-atomic', 'true'); if (severity === 'error'){ toast.setAttribute('style', 'width:100%'); if (severity === 'error' && message.length > 500){ toast.setAttribute('style', 'width:700px'); } const toastContent = Loading @@ -57,7 +57,7 @@ function toast(message, severity) { if (severity !== 'error') { setTimeout(() => { toast.classList.remove('show'); }, 3000); }, 5000); } } Loading js/Client/unicaenVue.js +19 −3 Changes for js/Client/unicaenVue.js: 19 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -83,11 +83,27 @@ unicaenVue.axios.interceptors.response.use(response => { return response; }, (error) => { var text = $("<div>").html(error.response.data); let message = error.response.data; text.find('i.fas').hide(); if (error.response.status == 403){ message = '<h4>403 - Accès interdit</h4><br />Vous n\'êtes pas autorisé(e) à faire cette action.'; }else if (error.response.status == 500) { const text = document.createElement("div"); text.innerHTML = error.response.data; flashMessenger.toast(text.find('.alert').html(), 'error'); // on masque l'icône /!\ qui fait doublon si on en trouve const fasIcons = text.querySelectorAll('i.fas'); fasIcons.forEach(icon => icon.style.display = "none"); message = text.querySelector('.alert').innerHTML; if (message === undefined){ message = error.response.data; } }else{ message = error.response.data; } flashMessenger.toast(message, 'error'); }); unicaenVue.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; Loading Loading
js/Client/flashMessenger.js +3 −3 Changes for js/Client/flashMessenger.js: 3 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -39,8 +39,8 @@ function toast(message, severity) { toast.setAttribute('aria-live', 'assertive'); toast.setAttribute('aria-atomic', 'true'); if (severity === 'error'){ toast.setAttribute('style', 'width:100%'); if (severity === 'error' && message.length > 500){ toast.setAttribute('style', 'width:700px'); } const toastContent = Loading @@ -57,7 +57,7 @@ function toast(message, severity) { if (severity !== 'error') { setTimeout(() => { toast.classList.remove('show'); }, 3000); }, 5000); } } Loading
js/Client/unicaenVue.js +19 −3 Changes for js/Client/unicaenVue.js: 19 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -83,11 +83,27 @@ unicaenVue.axios.interceptors.response.use(response => { return response; }, (error) => { var text = $("<div>").html(error.response.data); let message = error.response.data; text.find('i.fas').hide(); if (error.response.status == 403){ message = '<h4>403 - Accès interdit</h4><br />Vous n\'êtes pas autorisé(e) à faire cette action.'; }else if (error.response.status == 500) { const text = document.createElement("div"); text.innerHTML = error.response.data; flashMessenger.toast(text.find('.alert').html(), 'error'); // on masque l'icône /!\ qui fait doublon si on en trouve const fasIcons = text.querySelectorAll('i.fas'); fasIcons.forEach(icon => icon.style.display = "none"); message = text.querySelector('.alert').innerHTML; if (message === undefined){ message = error.response.data; } }else{ message = error.response.data; } flashMessenger.toast(message, 'error'); }); unicaenVue.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; Loading