ofbiz-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jacques Le Roux <jacques.le.r...@les7arts.com>
Subject Re: svn commit: r1846098 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/product/minilang/product/store/ applications/product/servicedef/ applications/product/widget/catalog/
Date Fri, 09 Nov 2018 07:43:08 GMT
Hi Deepak,

Yes I also think it's the right solution, just that it was easier in the meantime

Jacques


Le 09/11/2018 à 07:01, Deepak Dixit a écrit :
> I think instead of changing visualThemeId we can modify the common-theme
> work that is causing the issue.
>
>
> Thanks & Regards
> --
> Deepak Dixit
>
>
> On Thu, Nov 8, 2018 at 12:49 PM, <jleroux@apache.org> wrote:
>
>> Author: jleroux
>> Date: Thu Nov  8 07:19:20 2018
>> New Revision: 1846098
>>
>> URL: http://svn.apache.org/viewvc?rev=1846098&view=rev
>> Log:
>> "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.
>>
>> ------------------------------------------------------------------------
>>
>> Modified:
>>      ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
>>      ofbiz/ofbiz-framework/branches/release17.12/
>> applications/product/minilang/product/store/ProductStoreServices.xml
>>      ofbiz/ofbiz-framework/branches/release17.12/applications/product/
>> servicedef/services_store.xml
>>      ofbiz/ofbiz-framework/branches/release17.12/
>> applications/product/widget/catalog/StoreForms.xml
>>      ofbiz/ofbiz-framework/branches/release17.12/
>> applications/product/widget/catalog/StoreScreens.xml
>>
>> Propchange: ofbiz/ofbiz-framework/branches/release17.12/
>> ------------------------------------------------------------
>> ------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Thu Nov  8 07:19:20 2018
>> @@ -10,4 +10,4 @@
>>   /ofbiz/branches/json-integration-refactoring:1634077-1635900
>>   /ofbiz/branches/multitenant20100310:921280-927264
>>   /ofbiz/branches/release13.07:1547657
>> -/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,
>> 1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,
>> 1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,
>> 1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,
>> 1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,
>> 1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,
>> 1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,
>> 1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,
>> 1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,
>> 1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,
>> 1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,
>> 1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,
>> 1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995
>> +/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,
>> 1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,
>> 1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,
>> 1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,
>> 1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,
>> 1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,
>> 1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,
>> 1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,
>> 1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,
>> 1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,
>> 1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,
>> 1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,
>> 1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097
>>
>> Modified: ofbiz/ofbiz-framework/branches/release17.12/
>> applications/product/minilang/product/store/ProductStoreServices.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/
>> branches/release17.12/applications/product/minilang/product/store/
>> ProductStoreServices.xml?rev=1846098&r1=1846097&r2=1846098&view=diff
>> ============================================================
>> ==================
>> --- ofbiz/ofbiz-framework/branches/release17.12/
>> applications/product/minilang/product/store/ProductStoreServices.xml
>> (original)
>> +++ ofbiz/ofbiz-framework/branches/release17.12/
>> applications/product/minilang/product/store/ProductStoreServices.xml Thu
>> Nov  8 07:19:20 2018
>> @@ -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>
>>
>> Modified: ofbiz/ofbiz-framework/branches/release17.12/
>> applications/product/servicedef/services_store.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/
>> branches/release17.12/applications/product/servicedef/services_store.xml?
>> rev=1846098&r1=1846097&r2=1846098&view=diff
>> ============================================================
>> ==================
>> --- ofbiz/ofbiz-framework/branches/release17.12/applications/product/servicedef/services_store.xml
>> (original)
>> +++ ofbiz/ofbiz-framework/branches/release17.12/applications/product/servicedef/services_store.xml
>> Thu Nov  8 07:19:20 2018
>> @@ -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"
>>
>> Modified: ofbiz/ofbiz-framework/branches/release17.12/
>> applications/product/widget/catalog/StoreForms.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/
>> branches/release17.12/applications/product/widget/
>> catalog/StoreForms.xml?rev=1846098&r1=1846097&r2=1846098&view=diff
>> ============================================================
>> ==================
>> --- ofbiz/ofbiz-framework/branches/release17.12/
>> applications/product/widget/catalog/StoreForms.xml (original)
>> +++ ofbiz/ofbiz-framework/branches/release17.12/
>> applications/product/widget/catalog/StoreForms.xml Thu Nov  8 07:19:20
>> 2018
>> @@ -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"/>
>>
>> Modified: ofbiz/ofbiz-framework/branches/release17.12/
>> applications/product/widget/catalog/StoreScreens.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/
>> branches/release17.12/applications/product/widget/
>> catalog/StoreScreens.xml?rev=1846098&r1=1846097&r2=1846098&view=diff
>> ============================================================
>> ==================
>> --- ofbiz/ofbiz-framework/branches/release17.12/
>> applications/product/widget/catalog/StoreScreens.xml (original)
>> +++ ofbiz/ofbiz-framework/branches/release17.12/
>> applications/product/widget/catalog/StoreScreens.xml Thu Nov  8 07:19:20
>> 2018
>> @@ -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>
>>
>>
>>


Mime
View raw message