From: soufiane Date: Thu, 29 Feb 2024 14:44:11 +0000 (+0100) Subject: wait #6748 @1:00 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=802ef8ba964f080e1b933b9d4ad65f7115b378bb;p=fluidbook-toolbox.git wait #6748 @1:00 --- diff --git a/app/Http/Controllers/Admin/OpenToolsController.php b/app/Http/Controllers/Admin/OpenToolsController.php index c9d200b5b..a7bcd9d50 100644 --- a/app/Http/Controllers/Admin/OpenToolsController.php +++ b/app/Http/Controllers/Admin/OpenToolsController.php @@ -5,7 +5,6 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Admin\Operations\Tools\Excel2JSON; -use App\Http\Controllers\Admin\Operations\Tools\ImportFluidbookSettings; use App\Http\Controllers\Admin\Operations\Tools\PDF2SVGOperation; use App\Http\Controllers\Controller; use App\Http\Controllers\Admin\Operations\Tools\SASSCompiler; @@ -15,7 +14,6 @@ class OpenToolsController extends Controller use Excel2JSON; use SASSCompiler; use PDF2SVGOperation; - use ImportFluidbookSettings; protected function index($tool, $args = '') { diff --git a/app/Http/Controllers/Admin/Operations/Tools/ImportFluidbookSettings.php b/app/Http/Controllers/Admin/Operations/Tools/ImportFluidbookSettings.php index f6ec36ac1..aa437cc11 100644 --- a/app/Http/Controllers/Admin/Operations/Tools/ImportFluidbookSettings.php +++ b/app/Http/Controllers/Admin/Operations/Tools/ImportFluidbookSettings.php @@ -7,13 +7,14 @@ use App\Models\FluidbookPublication; use Cubist\Backpack\Magic\Fields\StandardFile; use Cubist\Backpack\Magic\Form; use Cubist\Excel\ExcelToArray; +use Illuminate\Support\Facades\Date; use Prologue\Alerts\Facades\Alert; trait ImportFluidbookSettings { use SettingsExportOperation; public function importfluidbooksettings() { - $form = new Form(backpack_url('opentools/doimportfluidbooksettings')); + $form = new Form(backpack_url('tools/doimportfluidbooksettings')); $form->setTitle(__('Importer les paramètres fluidbook')); $form->setEnctype('multipart/form-data'); $form->setSubmitLabel(__('Importer')); @@ -26,6 +27,9 @@ trait ImportFluidbookSettings * @throws \JsonException */ public function doimportfluidbooksettings() { + if (!can('fluidbook-publication:admin')) { + abort('403'); + } $file = request()->file('file'); ExcelToArray::setCache(protected_path('tools/importfluidbooksettings')); @@ -44,8 +48,6 @@ trait ImportFluidbookSettings return $n; },json_decode($f->settings, true)); - $settings['title'] = 'Test loutres 56'; - $intersect = array_intersect_key($settings,$res[$id]); $settingsJson = json_encode($intersect); @@ -61,6 +63,9 @@ trait ImportFluidbookSettings } } + $updated_at = Date::createFromDate()->toIso8601ZuluString(); + $diff['updated_at'] = $updated_at; + try { $f->update($diff); $f->save(); diff --git a/resources/views/tools/sidebar.blade.php b/resources/views/tools/sidebar.blade.php index f40605721..920565ce6 100644 --- a/resources/views/tools/sidebar.blade.php +++ b/resources/views/tools/sidebar.blade.php @@ -51,7 +51,9 @@ - + @endif