diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php index 12e9041..41b8f0a 100644 --- a/app/Http/Controllers/MediaController.php +++ b/app/Http/Controllers/MediaController.php @@ -145,18 +145,16 @@ class MediaController extends Controller * Chargement des médias * * @param \App\Http\Requests\Bo\LoadMediaRequest $request + * @param \App\Models\Sujet $sujet * @return \Illuminate\Http\JsonResponse */ - public function loadMedia(LoadMediaRequest $request): JsonResponse + public function loadMedia(LoadMediaRequest $request, Sujet $sujet): JsonResponse { /** @var \App\Models\User */ $user = auth()->user(); /** @var \App\Models\Dossier|null */ - $dossier = Dossier::where('id', $request->folder)->first(); - - /** @var \App\Models\Sujet */ - $sujet = Sujet::where('codeSujet', $request->sujet)->firstOrFail(); + $dossier = Dossier::where('id', $request->folder)->first(); $response = []; $filters = (object)collect($request->filters)->all(); diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 1d65351..ff8f5dd 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -8,6 +8,7 @@ use App\Models\Sujet; use Illuminate\Http\Request; use Adldap\Laravel\Facades\Adldap; use App\Http\Requests\DestroyUserRequest; +use App\Models\Dossier; use App\Models\Media; use Illuminate\Support\Facades\DB; @@ -293,23 +294,22 @@ class UserController extends Controller /** * Ajouter un dossier en favoris * - * @param Request $request + * @param \Illuminate\Http\Request $request + * @param \App\Models\Dossier $dossier * @return \Illuminate\Http\JsonResponse */ - public function favorisFolder(Request $request) + public function favorisFolder(Request $request, Dossier $dossier) { /** @var \App\Models\User $localUser */ $localUser = auth()->user(); - $dossier_id = $request->input('dossier_id'); - $favoris = $request->input('favoris'); + $dossierFavExists = $localUser->dossiers() + ->where('id', $dossier->id)->exists(); - $dossierFav = $localUser->dossiers()->where('id', $dossier_id)->first(); - - if ($favoris === false && $dossierFav) { - $localUser->dossiers()->detach($dossier_id); - } elseif ($favoris === true && !$dossierFav) { - $localUser->dossiers()->attach($dossier_id); + if (!$request->boolean('favoris') and $dossierFavExists) { + $localUser->dossiers()->detach($dossier->id); + } elseif ($request->boolean('favoris') and !$dossierFavExists) { + $localUser->dossiers()->attach($dossier->id); } return response()->json(); } diff --git a/app/Http/Requests/Bo/LoadMediaRequest.php b/app/Http/Requests/Bo/LoadMediaRequest.php index 6c6e680..f070e57 100644 --- a/app/Http/Requests/Bo/LoadMediaRequest.php +++ b/app/Http/Requests/Bo/LoadMediaRequest.php @@ -25,7 +25,6 @@ class LoadMediaRequest extends FormRequest public function rules() { return [ - 'sujet' => 'required|exists:sujets,codeSujet', 'offset' => 'sometimes|numeric', 'limit' => 'sometimes|numeric|gt:0|lte:50', 'folder' => 'sometimes|numeric', diff --git a/resources/js/components/media-manager/MmDisplayComponent.vue b/resources/js/components/media-manager/MmDisplayComponent.vue index 536b2cc..f1be4dd 100644 --- a/resources/js/components/media-manager/MmDisplayComponent.vue +++ b/resources/js/components/media-manager/MmDisplayComponent.vue @@ -217,7 +217,7 @@ export default { type: "updateGrabbed", grabbed: [], }); - this.loadMedias(); + this.loadMediaList(); //set dateSorted this.dateSorted = false; const _that = this; @@ -237,7 +237,7 @@ export default { $(".action_wrapper .display i.fa-calendar-check").show(); } }, - loadMedias($state = null) { + loadMediaList($state = null) { const self = this; if (this.offset === 0) { this.mediaList = []; @@ -250,8 +250,7 @@ export default { return; } axios - .post("/ajax/load-medias", { - sujet: this.storeSujet, + .post(`/ajax/load-media-list/${this.storeSujet}`, { folder: this.storeFolder, filters: this.storeFilters, offset: this.offset, @@ -306,7 +305,7 @@ export default { }); }, infiniteScroll($state) { - this.loadMedias($state); + this.loadMediaList($state); }, resetInfiniteScroll() { this.infiniteId = diff --git a/resources/js/components/media-manager/MmFolderComponent.vue b/resources/js/components/media-manager/MmFolderComponent.vue index d40298a..dbe6894 100644 --- a/resources/js/components/media-manager/MmFolderComponent.vue +++ b/resources/js/components/media-manager/MmFolderComponent.vue @@ -307,9 +307,8 @@ export default { const self = this; this.selectedFolder = folder; axios - .post("/ajax/favoris-folder", { - dossier_id: folder.id, - favoris: !folder.favoris, + .post(`/ajax/favoris-folder/${folder.id}`, { + favoris: !folder.favoris ? true : false, }) .then((response) => { self.reload(); diff --git a/routes/web.php b/routes/web.php index d1d56f6..12e7674 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,6 +1,5 @@ false, + 'verify' => false, + 'register' => false, +]); + Route::group(['middleware' => ['auth']], function () { - // Les pages Front . + // * Les pages Front . Route::get('/', [CommonController::class, 'showInterface'])->name('showInterface'); Route::get('/gestion-des-medias', [MediaController::class, 'showInterface'])->name('media_manager'); Route::get('/paniers', [PanierController::class, 'index'])->name('paniers'); Route::get('/media/{media}', [MediaController::class, 'show'])->name('media.show'); - // Message de contact . + // * Message de contact . Route::post('/send-message', [CommonController::class, 'sendMessage'])->name('sendMessage'); - // Ajax pour la gestion des dossiers . + // * Ajax pour la gestion des dossiers . Route::get('/ajax/load-folders', [DossierController::class, 'loadFolders']); - Route::post('/ajax/favoris-folder', [UserController::class, 'favorisFolder']); + Route::post('/ajax/favoris-folder/{dossier}', [UserController::class, 'favorisFolder']); - // Ajax pour la gestion des médias . - Route::post('/ajax/load-medias', [MediaController::class, 'loadMedia']); + // * Ajax pour la gestion des médias . + Route::post('/ajax/load-media-list/{sujet}', [MediaController::class, 'loadMedia']); Route::post('/ajax/move-media', [MediaController::class, 'moveMedia']); Route::post('/ajax/remove-media', [MediaController::class, 'removeMedia']); Route::post('/ajax/recover-media', [MediaController::class, 'recoverMedia']); @@ -42,7 +47,7 @@ Route::group(['middleware' => ['auth']], function () { Route::post('/ajax/download-media/{format?}', [MediaController::class, 'downloadMedia'])->name('downloadMedia'); Route::post('/ajax/media/{media}/get-media-others-infos', [MediaController::class, 'getMediaOtherInfos']); - // Ajax pour la gestion des panier . + // * Ajax pour la gestion des panier . Route::post('/ajax/add-media-basket', [PanierController::class, 'addMediasBasket']); Route::post('/ajax/remove-media-basket', [PanierController::class, 'removeMediasBasket']); Route::post('/ajax/add-basket', [PanierController::class, 'createBasket']); @@ -51,35 +56,27 @@ Route::group(['middleware' => ['auth']], function () { Route::post('/ajax/get-baskets', [PanierController::class, 'getBaskets']); Route::post('/ajax/save-basket-property', [PanierController::class, 'saveBasketProperty']); - // Back office . + // * Back office . Route::resource('user', UserController::class); - Route::post('/check-matricule', [UserController::class, 'checkMatricule']); + Route::resource('arcadialinks', ArcadiaLinkController::class)->only(['index', 'destroy']); Route::resource('dossier', DossierController::class)->except('show'); Route::get('/recovery', [RecoveryController::class, 'index'])->name('recovery.index'); - Route::post('/ajax/check-arcadia-id', [RecoveryController::class, 'checkArcadiaId']); - - Route::resource('arcadialinks', ArcadiaLinkController::class)->only(['index', 'destroy']); - Route::get('/ajax/get-datas-by-sujet/{sujet}', [CommonController::class, 'getDatasBySujet']); + Route::post('/check-matricule', [UserController::class, 'checkMatricule']); + Route::post('/ajax/check-arcadia-id', [RecoveryController::class, 'checkArcadiaId']); }); -Auth::routes([ - 'reset' => false, - 'verify' => false, - 'register' => false, -]); - -// Page pour déposer les médias . +// * Page pour déposer les médias . Route::get('/depot', [UploadController::class, 'showUploadForm'])->name('showUploadForm'); -// Ajax pour ajouter un dossier de dépôt . +// * Ajax pour ajouter un dossier de dépôt . Route::post('/ajax/add-depot-folder', [DossierController::class, 'addDepotFolder']); -// Ajax pour la gestion de l'upload de média . +// * Ajax pour la gestion de l'upload de média . Route::post('/ajax/upload-media/depot', [UploadController::class, 'uploadMediaFileIntoDepot']) ->name('media.uploadDepot'); Route::post('/ajax/upload-media/{sujet}/{dossier}', [UploadController::class, 'uploadMediaFile']) ->name('media.upload'); -// Les pages Front panier public. +// * Les pages Front panier public. Route::get('/basket/{basket_uuid}', [PanierController::class, 'showBasket']);