svn commit: r1765104 - /ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml

Author: jleroux
Date: Sat Oct 15 20:33:49 2016
New Revision: 1765104

URL: http://svn.apache.org/viewvc?rev=1765104&view=rev
Log:
Fixed: product page missing form elements
(OFBIZ-8489)

go to https://localhost:8443/catalog/control/EditProduct?productId=GZ-1000
notice missing form elements for 'shopping cart' and 'miscellaneous' section

This was initially my bad at r1446847 for OFBIZ-5136. I should not have
committed the changes in ProductForms.xml. It went unnoticed during 3 years,
then Deepak thought it was done on purpose and committed r1746676 in trunk for
OFBIZ-7151.

So it's only a matter of reverting these changes

Thanks: Wai for report

Modified:
    ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml

Modified: ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml?rev=1765104&r1=1765103&r2=1765104&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml Sat Oct 15 20:33:49 2016
@@ -240,30 +240,20 @@ under the License.
             <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
 
-        <field position="1" name="returnable" title="${uiLabelMap.ProductReturnable}" use-when="product==null">
+        <field position="1" name="returnable" title="${uiLabelMap.ProductReturnable}">
             <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
-        <field position="1" name="returnable" title="${uiLabelMap.ProductReturnable}" use-when="product!=null">
-            <display/>
-        </field>
-        <field position="2" name="includeInPromotions" title="${uiLabelMap.ProductIncludePromotions}" use-when="product==null">
+        <field position="2" name="includeInPromotions" title="${uiLabelMap.ProductIncludePromotions}">
             <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
-        <field position="2" name="includeInPromotions" title="${uiLabelMap.ProductIncludePromotions}" use-when="product!=null">
-            <display/>
-        </field>
-        <field position="3" name="taxable" title="${uiLabelMap.ProductTaxable}" use-when="product==null">
+
+        <field position="3" name="taxable" title="${uiLabelMap.ProductTaxable}">
             <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
-        <field position="3" name="taxable" title="${uiLabelMap.ProductTaxable}" use-when="product!=null">
-            <display/>
-        </field>
-        <field position="4" name="autoCreateKeywords" title="${uiLabelMap.ProductAutoCreateKeywords}" use-when="product==null">
+        <field position="4" name="autoCreateKeywords" title="${uiLabelMap.ProductAutoCreateKeywords}">
             <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
-        <field position="4" name="autoCreateKeywords" title="${uiLabelMap.ProductAutoCreateKeywords}" use-when="product!=null">
-            <display/>
-        </field>
+
         <field name="contentInfoText" title="${uiLabelMap.ProductContentInfoText}" widget-style="tooltip">
             <display description="${uiLabelMap.ProductNoteForContentOptions}" also-hidden="false"/>
         </field>
@@ -286,12 +276,9 @@ under the License.
         <field use-when="product!=null" position="2" name="createdByText" title="${uiLabelMap.CommonCreatedBy}:">
             <display description="[${product.createdByUserLogin}] ${uiLabelMap.CommonOn} ${product.createdDate}" also-hidden="false"/>
         </field>
-        <field name="orderDecimalQuantity" use-when="product==null">
+        <field name="orderDecimalQuantity" >
             <drop-down allow-empty="true" ><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
-        <field name="orderDecimalQuantity" use-when="product!=null">
-            <display/>
-        </field>
         <sort-order>
             <field-group>
                 <sort-field name="productId"/>