wait #6748 @1:00

diff --git a/app/Http/Controllers/Admin/OpenToolsController.php b/app/Http/Controllers/Admin/OpenToolsController.php
index c9d200b5b53ebf424ab4133534abcd05a3a60238..a7bcd9d502ee545f3249902604b6267ed99c1fe7 100644 (file)
--- 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 f6ec36ac1775d29f54a249ac03995b5eae82bc3a..aa437cc118bb09aabe76f99aaf098313d9a86be2 100644 (file)
--- 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 f40605721669f8a475ab5ae307c86ef716eb27a5..920565ce624ef8239769d258de80ebee65d7f951 100644 (file)
--- a/resources/views/tools/sidebar.blade.php
+++ b/resources/views/tools/sidebar.blade.php
@@ -51,7 +51,9 @@
     <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tools/svgcleaner') }}'><i
                 class='nav-icon la la-broom'></i>
             <span>{{__('Nettoyer un SVG')}}</span></a></li>
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('opentools/importfluidbooksettings') }}'><i
+    @if (can('fluidbook-publication:admin'))
+    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tools/importfluidbooksettings') }}'><i
                 class='nav-icon las la-link'></i>
             <span>{{__('Importer les paramètres de fluidbook')}}</span></a></li>
+    @endif
 </ul>