Merge branch 'main' into develop

NotFoundNL · Mar 8, 2024 · f9c9eb2 · f9c9eb2
2 parents 3738b81 + 1cb2a07
commit f9c9eb2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Http/Controllers/CmsEditor/CmsEditorTableController.php b/src/Http/Controllers/CmsEditor/CmsEditorTableController.php
@@ -44,13 +44,16 @@ public function index()
         $widget1 = new LayoutWidget('Tables', 6);
 
         $table = new LayoutTable(delete: false, edit: true, create: false, sort: false);
+        $table->addHeader(new LayoutTableHeader('Display name', 'name'));
         $table->addHeader(new LayoutTableHeader('Table', 'table'));
-
-        $tables = Table::orderBy('name')->get();
+        $table->addHeader(new LayoutTableHeader('Model', 'model'));
+        $tables = Table::orderBy('table')->get();
 
         foreach ($tables as $cmsTable) {
             $row = new LayoutTableRow($cmsTable->id, '/app/editor/table/'.$cmsTable->id);
-            $row->addColumn(new LayoutTableColumn($cmsTable->name, 'table'));
+            $row->addColumn(new LayoutTableColumn($cmsTable->name ?? '-', 'name'));
+            $row->addColumn(new LayoutTableColumn($cmsTable->table, 'table'));
+            $row->addColumn(new LayoutTableColumn($cmsTable->model ?? '-', 'table'));
             $table->addRow($row);
         }
         $widget1->addTable($table);
@@ -281,6 +284,7 @@ public function addField(FormDataRequest $request, Table $table)
                 'order' => $max,
                 'name' => $request->name,
                 'type' => $request->new_field,
+                'enabled' => true,
                 'internal' => $request->internal,
             ]);
             $response->addAction(new Redirect('/app/editor/table/'.$table->id.'/'.$newField->id));

diff --git a/src/Http/Controllers/CmsEditor/CmsEditorTableItemController.php b/src/Http/Controllers/CmsEditor/CmsEditorTableItemController.php
@@ -44,7 +44,7 @@ public function readOne(Table $table, TableItem $tableItem)
         $form->addInput($internalInput);
 
         $internalInput = new LayoutInputCheckbox('enabled', 'Enabled');
-        $internalInput->setValue($tableItem->enabled === 1 ? true : false);
+        $internalInput->setValue($tableItem->enabled);
         $form->addInput($internalInput);
 
         $type = ucfirst($tableItem->type);