You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2012/03/18 19:33:09 UTC

svn commit: r1302195 - /ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml

Author: jleroux
Date: Sun Mar 18 18:33:09 2012
New Revision: 1302195

URL: http://svn.apache.org/viewvc?rev=1302195&view=rev
Log:
Improve the LookupBulkAddProducts form by disabling the amount field when Product.requireAmount field is not "Y"

Modified:
    ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml

Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml?rev=1302195&r1=1302194&r2=1302195&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml Sun Mar 18 18:33:09 2012
@@ -151,6 +151,11 @@ under the License.
 
     <form name="LookupBulkAddProducts" type="multi" use-row-submit="true" list-name="productList" title="" target="BulkAddProducts"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupBulkAddProducts">
+        <row-actions>
+            <entity-one entity-name="Product" value-field="product" auto-field-map="true"/>
+            <set field=""/>
+            <set field="hasAmount" value="${groovy:product.getString('requireAmount')?:'N'}"/>
+        </row-actions>
         <field name="productId"  title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
             <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" target-type="inter-app">
                 <parameter param-name="productId"/>
@@ -161,9 +166,12 @@ under the License.
         <field name="quantity" title="${uiLabelMap.OrderQuantity}">
             <text size="5" maxlength="10"/>
         </field>
-        <field name="amount" title="${uiLabelMap.OrderAmount}">
+        <field use-when="${groovy: return 'Y'.equals(context.hasAmount)}"  name="amount" title="${uiLabelMap.OrderAmount}" >
             <text size="5" maxlength="10"/>
         </field>
+        <field use-when="${groovy: return 'N'.equals(context.hasAmount)}"  name="amount" title="${uiLabelMap.OrderAmount}" widget-style="disabled">
+            <text size="5" maxlength="10" disabled="true"/>
+        </field>        
         <field name="itemDesiredDeliveryDate" title="${uiLabelMap.OrderDesiredDeliveryDate}">
             <date-time/>
         </field>



Re: svn commit: r1302195 - /ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml

Posted by Jacques Le Roux <ja...@les7arts.com>.
This commits shows where it's really time to remove/replace BSH by Groovy. By default, use-when uses BSH. Hust try to do the same 
than I did below with it...

Jacques

From: <jl...@apache.org>
> Author: jleroux
> Date: Sun Mar 18 18:33:09 2012
> New Revision: 1302195
>
> URL: http://svn.apache.org/viewvc?rev=1302195&view=rev
> Log:
> Improve the LookupBulkAddProducts form by disabling the amount field when Product.requireAmount field is not "Y"
>
> Modified:
>    ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml
>
> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml?rev=1302195&r1=1302194&r2=1302195&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml (original)
> +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml Sun Mar 18 18:33:09 2012
> @@ -151,6 +151,11 @@ under the License.
>
>     <form name="LookupBulkAddProducts" type="multi" use-row-submit="true" list-name="productList" title="" 
> target="BulkAddProducts"
>         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupBulkAddProducts">
> +        <row-actions>
> +            <entity-one entity-name="Product" value-field="product" auto-field-map="true"/>
> +            <set field=""/>
> +            <set field="hasAmount" value="${groovy:product.getString('requireAmount')?:'N'}"/>
> +        </row-actions>
>         <field name="productId"  title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
>             <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" target-type="inter-app">
>                 <parameter param-name="productId"/>
> @@ -161,9 +166,12 @@ under the License.
>         <field name="quantity" title="${uiLabelMap.OrderQuantity}">
>             <text size="5" maxlength="10"/>
>         </field>
> -        <field name="amount" title="${uiLabelMap.OrderAmount}">
> +        <field use-when="${groovy: return 'Y'.equals(context.hasAmount)}"  name="amount" title="${uiLabelMap.OrderAmount}" >
>             <text size="5" maxlength="10"/>
>         </field>
> +        <field use-when="${groovy: return 'N'.equals(context.hasAmount)}"  name="amount" title="${uiLabelMap.OrderAmount}" 
> widget-style="disabled">
> +            <text size="5" maxlength="10" disabled="true"/>
> +        </field>
>         <field name="itemDesiredDeliveryDate" title="${uiLabelMap.OrderDesiredDeliveryDate}">
>             <date-time/>
>         </field>
>
>