svn commit: r1845996 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/product/widget/catalog/StoreForms.xml

Author: jleroux
Date: Wed Nov  7 09:37:13 2018
New Revision: 1845996

URL: http://svn.apache.org/viewvc?rev=1845996&view=rev
Log:
"Applied fix from trunk for revision: 1845995"
------------------------------------------------------------------------
r1845995 | jleroux | 2018-11-07 10:36:50 +0100 (mer. 07 nov. 2018) | 6 lignes

Fixed: Stores can't be modified at catalog/control/updateProductStore
(OFBIZ-10567)

Removes a hidden duplicate productStoreId field introduced with  OFBIZ-6924

This does not completely fixes the issue but allow to get ahead
------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/product/widget/catalog/StoreForms.xml

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov  7 09:37:13 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
+/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

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=1845996&r1=1845995&r2=1845996&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 Wed Nov  7 09:37:13 2018
@@ -43,11 +43,9 @@ under the License.
         header-row-style="header-row" default-table-style="basic-table">
         
         <alt-target use-when="productStore==null" target="createProductStore"/>
-        <auto-fields-service service-name="updateProductStore" map-name=""/>
+        <auto-fields-service service-name="updateProductStore"/>
 
         <field use-when="productStore!=null" name="productStoreId" tooltip="${uiLabelMap.ProductNotModificationRecreatingProductStore}"><display/></field>
-        <field name="productStoreId"><hidden/></field>
-
         <field name="primaryStoreGroupId">
             <drop-down allow-empty="true">
                 <entity-options entity-name="ProductStoreGroup" key-field-name="productStoreGroupId" description="${productStoreGroupName} [${productStoreGroupId}]">
@@ -436,7 +434,6 @@ under the License.
     <form name="UpdateProductStoreCatalog" type="list" target="updateProductStoreCatalog" title="" list-name="productStoreCatalogs"
         odd-row-style="alternate-row" default-table-style="basic-table" separate-columns="true">
         <auto-fields-service service-name="updateProductStoreCatalog"/>
-        <field name="productStoreId"><hidden/></field>
         <field name="prodCatalogId" title="${uiLabelMap.ProductCatalogId}">
             <display-entity entity-name="ProdCatalog" description="${catalogName}" also-hidden="true">
                 <sub-hyperlink target="EditProdCatalog" description="${prodCatalogId}" link-style="buttontext">