From 6e81ab084000c738f6ca7489db21f94e5cf65b59 Mon Sep 17 00:00:00 2001 From: Olivier Legat Date: Sun, 23 Jan 2022 15:34:20 +0100 Subject: [PATCH] adjustments --- app/Http/Controllers/Bo/PictosController.php | 3 ++- app/Http/Controllers/Bo/TextsController.php | 4 ++-- app/Models/Product.php | 2 -- resources/views/back/pictos/create.blade.php | 2 +- resources/views/back/texts/edit.blade.php | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Bo/PictosController.php b/app/Http/Controllers/Bo/PictosController.php index 5750ab0..ab48988 100644 --- a/app/Http/Controllers/Bo/PictosController.php +++ b/app/Http/Controllers/Bo/PictosController.php @@ -46,7 +46,8 @@ class PictosController extends Controller if (is_a($request->picture,"SplFileInfo")) { $picto->picture = Utils::storeImage($request->picture, $picto->getTable()); } - $picto->page = Page::marqueBloc2(); + //on ne peut pas arbitrairement créer tous les pictos à cet endroit + //$picto->page = Page::marqueBloc2(); if (!$picto->saveOrFail()) { return redirect()->route('bo.pictos.edit', $picto->id)->with('error', 'Le pictogramme n\'a pas été crée'); diff --git a/app/Http/Controllers/Bo/TextsController.php b/app/Http/Controllers/Bo/TextsController.php index d4016db..6d67acc 100644 --- a/app/Http/Controllers/Bo/TextsController.php +++ b/app/Http/Controllers/Bo/TextsController.php @@ -95,9 +95,9 @@ class TextsController extends Controller public function destroy(Text $text) { if (!$text->delete()) { - return redirect()->route('bo.texts.index')->with('error', trans('La suppression a échoué')); + return redirect()->route('bo.texts.content', $text->page)->with('error', trans('La suppression a échoué')); } - return redirect()->route('bo.texts.index')->with('success', trans('Suppression faite avec succès')); + return redirect()->route('bo.texts.content', $text->page)->with('success', trans('Suppression faite avec succès')); } } diff --git a/app/Models/Product.php b/app/Models/Product.php index 19a9419..614ef2f 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -30,8 +30,6 @@ class Product extends Model 'seo_description', ]; - //textual elements only - //TODO : make + produit ane pictos translatable public $translatable = [ 'name', 'slug', diff --git a/resources/views/back/pictos/create.blade.php b/resources/views/back/pictos/create.blade.php index f437e67..bdc98f1 100644 --- a/resources/views/back/pictos/create.blade.php +++ b/resources/views/back/pictos/create.blade.php @@ -5,7 +5,7 @@ @csrf

- < + < {{ __('Pictogrammes') }} {{ __('Création') }}