From 13d2345819214e32eeb7424b26f17d98e01d9536 Mon Sep 17 00:00:00 2001 From: Jia Jia Ji Date: Fri, 18 Feb 2022 17:04:38 +0100 Subject: [PATCH 1/2] removes layout definition when saving the schema configuration --- src/Controller/ConfigController.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Controller/ConfigController.php b/src/Controller/ConfigController.php index 286ba4e6..d54496a9 100644 --- a/src/Controller/ConfigController.php +++ b/src/Controller/ConfigController.php @@ -437,6 +437,14 @@ public function saveAction(Request $request): ?JsonResponse } } + foreach ($keys as $key) { + foreach ($dataDecoded['schema'][$key] ?? [] as $entityKey => $entity) { + foreach ($entity['columnConfig']['columns'] ?? [] as $columnKey => $column) { + unset($dataDecoded['schema'][$key][$entityKey]['columnConfig']['columns'][$columnKey]['attributes']['layout']); + } + } + } + $config->setConfiguration($dataDecoded); if ($config->isAllowed('read') && $config->isAllowed('update')) { From 0c448f4ab5ee5f1153e384a8c18398f8ab2b6576 Mon Sep 17 00:00:00 2001 From: Christian Fasching Date: Tue, 1 Mar 2022 14:26:43 +0100 Subject: [PATCH 2/2] removed layout information already in JS ... not just in controller --- src/Controller/ConfigController.php | 8 -------- src/Resources/public/js/fieldConfigDialog.js | 1 - 2 files changed, 9 deletions(-) diff --git a/src/Controller/ConfigController.php b/src/Controller/ConfigController.php index d54496a9..286ba4e6 100644 --- a/src/Controller/ConfigController.php +++ b/src/Controller/ConfigController.php @@ -437,14 +437,6 @@ public function saveAction(Request $request): ?JsonResponse } } - foreach ($keys as $key) { - foreach ($dataDecoded['schema'][$key] ?? [] as $entityKey => $entity) { - foreach ($entity['columnConfig']['columns'] ?? [] as $columnKey => $column) { - unset($dataDecoded['schema'][$key][$entityKey]['columnConfig']['columns'][$columnKey]['attributes']['layout']); - } - } - } - $config->setConfiguration($dataDecoded); if ($config->isAllowed('read') && $config->isAllowed('update')) { diff --git a/src/Resources/public/js/fieldConfigDialog.js b/src/Resources/public/js/fieldConfigDialog.js index c6a2ed25..d62a92b4 100644 --- a/src/Resources/public/js/fieldConfigDialog.js +++ b/src/Resources/public/js/fieldConfigDialog.js @@ -175,7 +175,6 @@ pimcore.plugin.datahub.fieldConfigDialog = Class.create({ attributes.attribute = child.data.key; attributes.label = child.data.layout ? child.data.layout.title : child.data.text; attributes.dataType = child.data.dataType; - attributes.layout = child.data.layout; if (child.data.width) { attributes.width = child.data.width; }