wait #6748 @0:10 refacto

diff --git a/app/Http/Controllers/Admin/Operations/Tools/ImportFluidbookSettings.php b/app/Http/Controllers/Admin/Operations/Tools/ImportFluidbookSettings.php
index 070de61e88dc756cf6399e262fd34901ea594241..291d92b24d6503548ece973d882862d1cb033a81 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/Tools/ImportFluidbookSettings.php
+++ b/app/Http/Controllers/Admin/Operations/Tools/ImportFluidbookSettings.php
@@ -37,6 +37,8 @@ trait ImportFluidbookSettings
 
         //
         $ids = array_keys($res);
+        $instance = new FluidbookPublication();
+        $fields = $instance->getFields();
 
         foreach ($ids as $id) {
             try {
@@ -44,6 +46,7 @@ trait ImportFluidbookSettings
             } catch (\Exception $e) {
                 return redirect()->back()->with('error', 'Fluidbook id not found');
             }
+
             $settings = array_map(function($n) {
                 return $n;
             },json_decode($f->settings, true));
@@ -67,8 +70,10 @@ trait ImportFluidbookSettings
                     }
                 }
 
-                if(in_array($k, ['composition_fluidbook','tag_public','composition_fluidbook_links'])) {
-                    $value = (bool)$value;
+                if(array_key_exists($k, $fields)) {
+                    if($fields[$k]->getDatabaseType() === "boolean") {
+                        $value = (bool)$value;
+                    }
                 }
             }