wait #6717 @0:25

diff --git a/app/Console/Commands/FluidbookSettingsExport.php b/app/Console/Commands/FluidbookSettingsExport.php
index 65b1754e48afedddf863c81d521a56de15f6a676..61d8b9b956bed5678feeeac7f064ac37ec6cfa27 100644 (file)
--- a/app/Console/Commands/FluidbookSettingsExport.php
+++ b/app/Console/Commands/FluidbookSettingsExport.php
@@ -47,8 +47,9 @@ class FluidbookSettingsExport extends ToolboxCommand
         $listID = ArrayUtil::parseRange($this->argument('id'));
         $model = FluidbookPublication::whereIn('id',$listID);
 
-        $settings = $model->get("settings")->map(function($i){
-            return json_decode($i->settings, true);
+        $settings = $model->get()->map(function($i){
+            $extraFields = ["#" => $i->id];
+            return array_merge($extraFields,json_decode($i->settings, true));
         })->toArray();
 
         $fields = $model->get()->map(function($i) {
@@ -56,9 +57,13 @@ class FluidbookSettingsExport extends ToolboxCommand
         })->toArray();
 
         $field = [];
+        $field['#'] = [
+            'type' => 'noteditable',
+            'editable' => false
+        ];
 
         foreach ($fields as $key => $f) {
-            foreach ($f as $g) {
+            foreach ($f as $k => $g) {
                 $name = $g->getAttribute('name');
                 $field[$name] = [
                     'type' => $g->getAttribute('type'),