"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
This commit is contained in:
Jacques Le Roux
2018-11-08 07:19:20 +00:00
parent 82b0fc150c
commit cbdfadfba1
4 changed files with 14 additions and 5 deletions
@@ -89,6 +89,9 @@ under the License.
<set from-field="store.inventoryFacilityId" field="oldFacilityId"/>
<set-nonpk-fields map="parameters" value-field="store"/>
<!-- visualThemeId must be replaced by ecomThemeId because of Entity.field names conflict. See OFBIZ-10567 -->
<set field="store.visualThemeId" from-field="parameters.ecomThemeId"/>
<if-compare field="store.showPricesWithVatTax" operator="equals" value="Y">
<if-empty field="store.vatTaxAuthGeoId">
<add-error>
@@ -36,7 +36,11 @@ under the License.
location="component://product/minilang/product/store/ProductStoreServices.xml" invoke="updateProductStore">
<description>Update a Product Store</description>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<!-- visualThemeId must be replaced by ecomThemeId because of Entity.field names conflict. See OFBIZ-10567 -->
<auto-attributes include="nonpk" mode="IN" optional="true">
<exclude field-name="visualThemeId"/>
</auto-attributes>
<attribute name="ecomThemeId" mode="IN" type="String"/>
</service>
<service name="reserveStoreInventory" engine="simple"
@@ -220,7 +220,9 @@ under the License.
</entity-options>
</drop-down>
</field>
<field name="visualThemeId">
<!-- visualThemeId must be replaced by ecomThemeId because of Entity.field names conflict. See OFBIZ-10567 -->
<field name="ecomThemeId" entry-name="visualThemeId">
<drop-down allow-empty="true">
<entity-options key-field-name="visualThemeId" description="${visualThemeId} - ${description}" entity-name="VisualTheme">
<entity-constraint name="visualThemeSetId" operator="equals" value="ECOMMERCE"/>
@@ -323,7 +325,7 @@ under the License.
<sort-field name="subtitle"/>
<sort-field name="companyName"/>
<sort-field name="isDemoStore"/>
<sort-field name="visualThemeId"/>
<sort-field name="ecomThemeId"/>
</field-group>
<field-group title="${uiLabelMap.CommonInventory}" collapsible="true">
<sort-field name="inventoryFacilityId"/>
@@ -689,9 +689,9 @@ under the License.
</decorator-screen>
</widgets>
<fail-widgets>
<screenlet title="${uiLabelMap.ProductProductStoreGroup} ${productStoreGroup.productStoreGroupName} [${productStoreGroup.productStoreGroupId}]" name="editProductStoreGroup" collapsible="true" initially-collapsed="true">
<screenlet title="${uiLabelMap.ProductProductStoreGroup} ${productStoreGroup.productStoreGroupName} [${productStoreGroup.productStoreGroupId}]" name="editProductStoreGroup" collapsible="true" initially-collapsed="true">
<include-form name="EditProductStoreGroup" location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
</screenlet>
<screenlet title="${uiLabelMap.ProductProductStoreGroupRollup}" id="editProductStoreGroupRollup" name="editProductStoreGroupRollup" collapsible="true" initially-collapsed="true">
<include-form name="ListProductStoreGroupAssoc" location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>