From cbdfadfba1ad7ea51cf7e66e40d200556038b8eb Mon Sep 17 00:00:00 2001 From: Jacques Le Roux Date: Thu, 8 Nov 2018 07:19:20 +0000 Subject: [PATCH] "Applied fix from trunk for revision: 1846097" ------------------------------------------------------------------------ r1846097 | jleroux | 2018-11-08 08:18:43 +0100 (jeu. 08 nov. 2018) | 22 lignes Fixed: Stores can't be modified at catalog/control/updateProductStore (OFBIZ-10567) This is related with the common-theme introduction. There are 2 fields named visualThemeId in the data model. The one in ProductStore entity existed before the common-theme introduction with the new entity VisualTheme. When the theme is initialised with InitTheme.groovy it sets the context.visualThemeId value if it does not exist yet with parameters.visualThemeId. At this point things get confused and the backend theme used is replaced by the ecommerce theme defined for the productStore. I think it would overwhelming to change the data model when only the EditProductStore form and updateProductStore service are concerned. So here is a very simple workaround where visualThemeId is replaced by ecomThemeId in the EditProductStore form and updateProductStore service. If someone prefers to change the data model and related code feel free to revert, reopen the Jira and do. ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1846098 13f79535-47bb-0310-9956-ffa450edef68 --- .../product/minilang/product/store/ProductStoreServices.xml | 3 +++ applications/product/servicedef/services_store.xml | 6 +++++- applications/product/widget/catalog/StoreForms.xml | 6 ++++-- applications/product/widget/catalog/StoreScreens.xml | 4 ++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/applications/product/minilang/product/store/ProductStoreServices.xml b/applications/product/minilang/product/store/ProductStoreServices.xml index ac8297e196..fcc2b25ffb 100644 --- a/applications/product/minilang/product/store/ProductStoreServices.xml +++ b/applications/product/minilang/product/store/ProductStoreServices.xml @@ -89,6 +89,9 @@ under the License. + + + diff --git a/applications/product/servicedef/services_store.xml b/applications/product/servicedef/services_store.xml index 24951f109d..33c4e9f478 100644 --- a/applications/product/servicedef/services_store.xml +++ b/applications/product/servicedef/services_store.xml @@ -36,7 +36,11 @@ under the License. location="component://product/minilang/product/store/ProductStoreServices.xml" invoke="updateProductStore"> Update a Product Store - + + + + + - + + + @@ -323,7 +325,7 @@ under the License. - + diff --git a/applications/product/widget/catalog/StoreScreens.xml b/applications/product/widget/catalog/StoreScreens.xml index 4fe844ca7a..02e7146e23 100644 --- a/applications/product/widget/catalog/StoreScreens.xml +++ b/applications/product/widget/catalog/StoreScreens.xml @@ -689,9 +689,9 @@ under the License. - + - +