forge-joniko/ldc-dam
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Fix contact

Browse source 
- Fix DossierController
- Tmp fix arcadia
This commit is contained in:
Vincent BRIDIER 2019-10-24 17:04:04 +02:00
parent edb97bf945
commit 0ccacd87f3
6 changed files with 53 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -19,3 +19,4 @@ Homestead.json
Homestead.yaml
npm-debug.log
yarn-error.log
.idea/

6
app/Http/Controllers/DossierController.php
View file

@ -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;

5
app/Mail/contact.php
View file

@ -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]);
}
}

50
public/js/app.js vendored
View file

@ -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");
/***/ })

6
resources/views/layouts/media_edit.blade.php
View file

@ -4,7 +4,7 @@
<a href="#" class="tabbtn form_media_preview active" data-tab="0">Aperçu</a>
<a href="#" class="tabbtn form_media_edit" data-tab="1">Edition</a>
@if (Auth::user()->hasRole([config('roles.const.CONTRIBUTEUR'), config('roles.const.ADMIN'), config('roles.const.REDACTEUR')]))
<a href="#" class="tabbtn form_media_retouch" data-tab="2">Retouche</a>
<!--<a href="#" class="tabbtn form_media_retouch" data-tab="2">Retouche</a>-->
@endif
<a href="#" class="tabbtn form_media_links" data-tab="3">Vignettes</a>
<a href="#" class="tabbtn form_media_history" data-tab="4">Historique</a>
@ -81,10 +81,10 @@
<label for="updated_at">Date de modification</label>
<input type="text" id="updated_at" name="updated_at" readonly >
</div>
<div class="row">
<!--<div class="row">
<label for="published_at">Date de publication</label>
<input type="date" id="published_at" name="published_at" >
</div>
</div>-->
<div class="row">
<label for="statut">Statut</label>
<select id="statut" name="statut">

6
resources/views/mails/contact.blade.php
View file

@ -11,9 +11,9 @@
<p style='font-family: arial; font-size:13px; text-align: left; color: #393939;'>Message de {{$user->firstname." ".$user->lastname." (".$user->email.")"}}</p><br/>
<p style='font-family: arial; font-size:13px; text-align: left; color: #393939;'>
Type de demande : </br>
Url de la page : </br></br>
Message : </br>
Type de demande : {{ $type }}</br>
Url de la page : {{ $url }}</br></br>
Message : {{ $message }}</br>
</p>
</body>