From 0ccacd87f38b729321747dbe1040a3cd7d1e3e4a Mon Sep 17 00:00:00 2001 From: Vincent BRIDIER Date: Thu, 24 Oct 2019 17:04:04 +0200 Subject: [PATCH] - Fix contact - Fix DossierController - Tmp fix arcadia --- .gitignore | 1 + app/Http/Controllers/DossierController.php | 6 +-- app/Mail/contact.php | 5 +- public/js/app.js | 50 +++++++++++++++----- resources/views/layouts/media_edit.blade.php | 6 +-- resources/views/mails/contact.blade.php | 6 +-- 6 files changed, 53 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index ddbff90..1027690 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ Homestead.json Homestead.yaml npm-debug.log yarn-error.log +.idea/ diff --git a/app/Http/Controllers/DossierController.php b/app/Http/Controllers/DossierController.php index b2b873b..368db86 100644 --- a/app/Http/Controllers/DossierController.php +++ b/app/Http/Controllers/DossierController.php @@ -201,14 +201,13 @@ class DossierController extends Controller $query->whereIn("marque_id", $marques); }); } - $dossierQuery = $dossierQuery->get(); - - + $dossierQuery = $dossierQuery->orderBy('libelle', 'ASC')->get(); // Ajout du dépôt de fichier pour les admin if(Auth::user()->hasRole(config('roles.const.ADMIN')) ){ $depotQuery = Dossier::whereNull('parent_id') ->where('system', 1) + ->orderBy('libelle', 'ASC') ->get(); $response['data'] = $dossierQuery->merge($depotQuery); }else{ @@ -267,6 +266,7 @@ class DossierController extends Controller }else{ $dossier->system = 0; } + $dossier->sujet_id = $dossierParent->sujet_id; $dossier->save(); $response['folder_id'] = $dossier->id; diff --git a/app/Mail/contact.php b/app/Mail/contact.php index 40438a6..5c78c48 100644 --- a/app/Mail/contact.php +++ b/app/Mail/contact.php @@ -36,6 +36,9 @@ class contact extends Mailable */ public function build() { - return $this->view('mails.contact')->with(['type' => $this->type, 'url' => $this->url, 'message' => $this->message, 'user' => $this->user]); + return $this->from('dam@ldc.fr', 'DAM') + ->subject('Message d\'un utilisateur') + ->view('mails.contact') + ->with(['type' => $this->type, 'url' => $this->url, 'message' => $this->message, 'user' => $this->user]); } } diff --git a/public/js/app.js b/public/js/app.js index 500ee55..8d6c020 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -12227,7 +12227,20 @@ $(document).ready(function () { $('.tab_edit .btn-arcadia-link').on('click', function (event) { event.preventDefault(); var arcadia_id = $("#arcadia_id").val(); - arcadia_id = prompt("Indiquez le code Arcadia de ce média", arcadia_id); + arcadia_id = prompt("Indiquez le code Arcadia de ce média", arcadia_id); // Si la saisie est vide on affiche le message d'erreur et on n'execute pas l'ajax + + if (arcadia_id === "") { + $.fancybox.close(); + $.fancyMessage({ + title: "Lier un média à Arcadia", + message: "Le code Arcadia est vide.", + type: "error" + }); + return; + } else if (arcadia_id === null) { + return; + } + $.ajax({ url: '/ajax/set-id-arcadia', method: 'POST', @@ -12279,8 +12292,20 @@ $(document).ready(function () { $('.tab_edit .add_article').on('click', function (event) { event.preventDefault(); - var arcadia_id = prompt("Indiquez le code Arcadia de l'article.", arcadia_id); - if (arcadia_id === null) return false; + var arcadia_id = prompt("Indiquez le code Arcadia de l'article.", arcadia_id); // Si la saisie est vide on affiche le message d'erreur et on n'execute pas l'ajax + + if (arcadia_id === "") { + $.fancybox.close(); + $.fancyMessage({ + title: "Lier un média à un article Arcadia", + message: "Le code Arcadia est vide.", + type: "error" + }); + return; + } else if (arcadia_id === null) { + return; + } + $.ajax({ url: '/ajax/get-article', method: 'POST', @@ -12491,6 +12516,7 @@ $(document).ready(function () { message: "Le formulaire a mal été renseigné. merci de corriger.", type: "error" }); + return; } var media = { @@ -12740,6 +12766,7 @@ $(document).ready(function () { $(".uploader-window").stop().fadeOut("fast"); }, done: function done(e, data) { + console.log(data); $.each(data.files, function (index, file) { currentfiles = arrayRemove(currentfiles, $.trim(file.name)); }); //---- Chargement des médias @@ -13843,8 +13870,9 @@ $(document).ready(function () { }); // ---- Réinitialisation de la recherche $(".reinit_search_btn").on('click', function (event) { - event.preventDefault(); // Vide la bar recherche + event.preventDefault(); // Vide la barre recherche + $(".search_filters .search_value").val(''); $.each(Object.keys($(window).data('filter')), function (index, value) { if (value != "currentFolder") $(".search_filters_list #" + value).remove(); }); // supprime tous les éléments de recherche @@ -13952,13 +13980,13 @@ window.updateFilter = function (filter) { /*! no static exports found */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(/*! D:\sources\www\ldc-dam\resources\js\app.js */"./resources/js/app.js"); -__webpack_require__(/*! D:\sources\www\ldc-dam\resources\js\admin.js */"./resources/js/admin.js"); -__webpack_require__(/*! D:\sources\www\ldc-dam\resources\js\media.js */"./resources/js/media.js"); -__webpack_require__(/*! D:\sources\www\ldc-dam\resources\js\depot.js */"./resources/js/depot.js"); -__webpack_require__(/*! D:\sources\www\ldc-dam\resources\js\panier.js */"./resources/js/panier.js"); -__webpack_require__(/*! D:\sources\www\ldc-dam\resources\js\searchengine.js */"./resources/js/searchengine.js"); -module.exports = __webpack_require__(/*! D:\sources\www\ldc-dam\resources\sass\app.scss */"./resources/sass/app.scss"); +__webpack_require__(/*! D:\laragon\www\dam\resources\js\app.js */"./resources/js/app.js"); +__webpack_require__(/*! D:\laragon\www\dam\resources\js\admin.js */"./resources/js/admin.js"); +__webpack_require__(/*! D:\laragon\www\dam\resources\js\media.js */"./resources/js/media.js"); +__webpack_require__(/*! D:\laragon\www\dam\resources\js\depot.js */"./resources/js/depot.js"); +__webpack_require__(/*! D:\laragon\www\dam\resources\js\panier.js */"./resources/js/panier.js"); +__webpack_require__(/*! D:\laragon\www\dam\resources\js\searchengine.js */"./resources/js/searchengine.js"); +module.exports = __webpack_require__(/*! D:\laragon\www\dam\resources\sass\app.scss */"./resources/sass/app.scss"); /***/ }) diff --git a/resources/views/layouts/media_edit.blade.php b/resources/views/layouts/media_edit.blade.php index bc3fb09..33e72cf 100644 --- a/resources/views/layouts/media_edit.blade.php +++ b/resources/views/layouts/media_edit.blade.php @@ -4,7 +4,7 @@ Aperçu Edition @if (Auth::user()->hasRole([config('roles.const.CONTRIBUTEUR'), config('roles.const.ADMIN'), config('roles.const.REDACTEUR')])) - Retouche + @endif Vignettes Historique @@ -81,10 +81,10 @@ -
+