From ba513adecb1fe8723e0109785bf109378e22ebb0 Mon Sep 17 00:00:00 2001 From: Paul Verdu Date: Mon, 28 Oct 2024 09:41:00 +0100 Subject: [PATCH 1/3] Fix issue where Import- and ExportDefinition data is not correctly loaded from repository cache --- src/DataDefinitionsBundle/Model/ExportDefinition/Dao.php | 2 +- src/DataDefinitionsBundle/Model/ImportDefinition/Dao.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DataDefinitionsBundle/Model/ExportDefinition/Dao.php b/src/DataDefinitionsBundle/Model/ExportDefinition/Dao.php index 849e7d59..df088486 100644 --- a/src/DataDefinitionsBundle/Model/ExportDefinition/Dao.php +++ b/src/DataDefinitionsBundle/Model/ExportDefinition/Dao.php @@ -40,7 +40,7 @@ public function configure(): void parent::configure([ 'containerConfig' => $definitions, - 'settingsStoreScope' => 'data_definitions', + 'settingsStoreScope' => 'data_definitions.' . self::CONFIG_KEY, 'storageConfig' => $storageConfig, ]); } diff --git a/src/DataDefinitionsBundle/Model/ImportDefinition/Dao.php b/src/DataDefinitionsBundle/Model/ImportDefinition/Dao.php index aaece3b8..2ba4425a 100644 --- a/src/DataDefinitionsBundle/Model/ImportDefinition/Dao.php +++ b/src/DataDefinitionsBundle/Model/ImportDefinition/Dao.php @@ -43,7 +43,7 @@ public function configure(): void parent::configure([ 'containerConfig' => $definitions, - 'settingsStoreScope' => 'data_definitions', + 'settingsStoreScope' => 'data_definitions.' . self::CONFIG_KEY, 'storageConfig' => $storageConfig, ]); } From 8e6e0bc9f8d81b75f240a062c306bc076b83f875 Mon Sep 17 00:00:00 2001 From: Paul Verdu Date: Mon, 28 Oct 2024 09:57:51 +0100 Subject: [PATCH 2/3] Revert "Fix issue where Import- and ExportDefinition data is not correctly loaded from repository cache" This reverts commit ba513adecb1fe8723e0109785bf109378e22ebb0. --- src/DataDefinitionsBundle/Model/ExportDefinition/Dao.php | 2 +- src/DataDefinitionsBundle/Model/ImportDefinition/Dao.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DataDefinitionsBundle/Model/ExportDefinition/Dao.php b/src/DataDefinitionsBundle/Model/ExportDefinition/Dao.php index 5fd148b8..0039b1a5 100644 --- a/src/DataDefinitionsBundle/Model/ExportDefinition/Dao.php +++ b/src/DataDefinitionsBundle/Model/ExportDefinition/Dao.php @@ -39,7 +39,7 @@ public function configure(): void parent::configure([ 'containerConfig' => $definitions, - 'settingsStoreScope' => 'data_definitions.' . self::CONFIG_KEY, + 'settingsStoreScope' => 'data_definitions', 'storageConfig' => $storageConfig, ]); } diff --git a/src/DataDefinitionsBundle/Model/ImportDefinition/Dao.php b/src/DataDefinitionsBundle/Model/ImportDefinition/Dao.php index 12fc212b..b37a03ae 100644 --- a/src/DataDefinitionsBundle/Model/ImportDefinition/Dao.php +++ b/src/DataDefinitionsBundle/Model/ImportDefinition/Dao.php @@ -42,7 +42,7 @@ public function configure(): void parent::configure([ 'containerConfig' => $definitions, - 'settingsStoreScope' => 'data_definitions.' . self::CONFIG_KEY, + 'settingsStoreScope' => 'data_definitions', 'storageConfig' => $storageConfig, ]); } From 252fb106bcefdb893ec9c05d6943ac9d529b17d5 Mon Sep 17 00:00:00 2001 From: paulverdu Date: Mon, 28 Oct 2024 09:58:30 +0100 Subject: [PATCH 3/3] Fix issue where Import- and ExportDefinition data is not correctly loaded from repository cache --- src/DataDefinitionsBundle/Model/ExportDefinition/Dao.php | 2 +- src/DataDefinitionsBundle/Model/ImportDefinition/Dao.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DataDefinitionsBundle/Model/ExportDefinition/Dao.php b/src/DataDefinitionsBundle/Model/ExportDefinition/Dao.php index 0039b1a5..5fd148b8 100644 --- a/src/DataDefinitionsBundle/Model/ExportDefinition/Dao.php +++ b/src/DataDefinitionsBundle/Model/ExportDefinition/Dao.php @@ -39,7 +39,7 @@ public function configure(): void parent::configure([ 'containerConfig' => $definitions, - 'settingsStoreScope' => 'data_definitions', + 'settingsStoreScope' => 'data_definitions.' . self::CONFIG_KEY, 'storageConfig' => $storageConfig, ]); } diff --git a/src/DataDefinitionsBundle/Model/ImportDefinition/Dao.php b/src/DataDefinitionsBundle/Model/ImportDefinition/Dao.php index b37a03ae..12fc212b 100644 --- a/src/DataDefinitionsBundle/Model/ImportDefinition/Dao.php +++ b/src/DataDefinitionsBundle/Model/ImportDefinition/Dao.php @@ -42,7 +42,7 @@ public function configure(): void parent::configure([ 'containerConfig' => $definitions, - 'settingsStoreScope' => 'data_definitions', + 'settingsStoreScope' => 'data_definitions.' . self::CONFIG_KEY, 'storageConfig' => $storageConfig, ]); }