You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2011/03/24 21:56:22 UTC
svn commit: r1085137 -
/ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml
Author: erwan
Date: Thu Mar 24 20:56:22 2011
New Revision: 1085137
URL: http://svn.apache.org/viewvc?rev=1085137&view=rev
Log:
Now using the entity-option for drop-downs in the price rules forms. We can display the entitylabels
Modified:
ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml
Modified: ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml?rev=1085137&r1=1085136&r2=1085137&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml Thu Mar 24 20:56:22 2011
@@ -80,12 +80,16 @@
<field name="productPriceCondSeqId"><hidden/></field><!-- Users don't need this information there, the screen is already sufficiently complex! -->
<field name="inputParamEnumId" title="${uiLabelMap.ProductInput}">
<drop-down allow-empty="false" current="selected">
- <list-options list-name="inputParamEnums" key-name="enumId" description="${description}"/>
+ <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+ <entity-constraint name="enumTypeId" operator="equals" value="PROD_PRICE_IN_PARAM"/>
+ </entity-options>
</drop-down>
</field>
<field name="operatorEnumId" title="${uiLabelMap.ProductOperator}">
<drop-down allow-empty="false" current="selected">
- <list-options list-name="condOperEnums" key-name="enumId" description="${description}"/>
+ <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+ <entity-constraint name="enumTypeId" operator="equals" value="PROD_PRICE_COND"/>
+ </entity-options>
</drop-down>
</field>
<field use-when=""PRIP_QUANTITY".equals(inputParamEnumId) || "PRIP_LIST_PRICE".equals(inputParamEnumId)"
@@ -113,12 +117,16 @@
<field name="new"><display default-value="${uiLabelMap.ProductPriceRulesNewCond}"/></field>
<field name="inputParamEnumId" title="${uiLabelMap.ProductInput}">
<drop-down allow-empty="false">
- <list-options list-name="inputParamEnums" key-name="enumId" description="${description}"/>
+ <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+ <entity-constraint name="enumTypeId" operator="equals" value="PROD_PRICE_IN_PARAM"/>
+ </entity-options>
</drop-down>
</field>
<field name="operatorEnumId" title="${uiLabelMap.ProductOperator}">
<drop-down allow-empty="false">
- <list-options list-name="condOperEnums" key-name="enumId" description="${description}"/>
+ <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+ <entity-constraint name="enumTypeId" operator="equals" value="PROD_PRICE_COND"/>
+ </entity-options>
</drop-down>
</field>
<field name="condValueInput" title="${uiLabelMap.ProductValue}"><text size="10"/></field>
@@ -153,7 +161,7 @@
<field name="new"><display default-value="${uiLabelMap.ProductPriceRulesNewAction}"/></field>
<field name="productPriceActionTypeId" title="${uiLabelMap.ProductActionType}">
<drop-down allow-empty="false">
- <list-options list-name="productPriceActionTypes" key-name="productPriceActionTypeId" description="${description}"/>
+ <entity-options entity-name="ProductPriceActionType" description="${description}" key-field-name="productPriceActionTypeId"/>
</drop-down>
</field>
<field name="amount" title="${uiLabelMap.ProductValue}"><text/></field>
Re: svn commit: r1085137 - /ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml
Posted by Jacques Le Roux <ja...@les7arts.com>.
Well done Erwan, still an effort to have also the right fields ;o)
Jacques
> Author: erwan
> Date: Thu Mar 24 20:56:22 2011
> New Revision: 1085137
>
> URL: http://svn.apache.org/viewvc?rev=1085137&view=rev
> Log:
> Now using the entity-option for drop-downs in the price rules forms. We can display the entitylabels
>
> Modified:
> ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml
>
> Modified: ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml?rev=1085137&r1=1085136&r2=1085137&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml (original)
> +++ ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml Thu Mar 24 20:56:22 2011
> @@ -80,12 +80,16 @@
> <field name="productPriceCondSeqId"><hidden/></field><!-- Users don't need this information there, the screen is already
> sufficiently complex! -->
> <field name="inputParamEnumId" title="${uiLabelMap.ProductInput}">
> <drop-down allow-empty="false" current="selected">
> - <list-options list-name="inputParamEnums" key-name="enumId" description="${description}"/>
> + <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
> + <entity-constraint name="enumTypeId" operator="equals" value="PROD_PRICE_IN_PARAM"/>
> + </entity-options>
> </drop-down>
> </field>
> <field name="operatorEnumId" title="${uiLabelMap.ProductOperator}">
> <drop-down allow-empty="false" current="selected">
> - <list-options list-name="condOperEnums" key-name="enumId" description="${description}"/>
> + <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
> + <entity-constraint name="enumTypeId" operator="equals" value="PROD_PRICE_COND"/>
> + </entity-options>
> </drop-down>
> </field>
> <field use-when=""PRIP_QUANTITY".equals(inputParamEnumId) ||
> "PRIP_LIST_PRICE".equals(inputParamEnumId)"
> @@ -113,12 +117,16 @@
> <field name="new"><display default-value="${uiLabelMap.ProductPriceRulesNewCond}"/></field>
> <field name="inputParamEnumId" title="${uiLabelMap.ProductInput}">
> <drop-down allow-empty="false">
> - <list-options list-name="inputParamEnums" key-name="enumId" description="${description}"/>
> + <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
> + <entity-constraint name="enumTypeId" operator="equals" value="PROD_PRICE_IN_PARAM"/>
> + </entity-options>
> </drop-down>
> </field>
> <field name="operatorEnumId" title="${uiLabelMap.ProductOperator}">
> <drop-down allow-empty="false">
> - <list-options list-name="condOperEnums" key-name="enumId" description="${description}"/>
> + <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
> + <entity-constraint name="enumTypeId" operator="equals" value="PROD_PRICE_COND"/>
> + </entity-options>
> </drop-down>
> </field>
> <field name="condValueInput" title="${uiLabelMap.ProductValue}"><text size="10"/></field>
> @@ -153,7 +161,7 @@
> <field name="new"><display default-value="${uiLabelMap.ProductPriceRulesNewAction}"/></field>
> <field name="productPriceActionTypeId" title="${uiLabelMap.ProductActionType}">
> <drop-down allow-empty="false">
> - <list-options list-name="productPriceActionTypes" key-name="productPriceActionTypeId"
> description="${description}"/>
> + <entity-options entity-name="ProductPriceActionType" description="${description}"
> key-field-name="productPriceActionTypeId"/>
> </drop-down>
> </field>
> <field name="amount" title="${uiLabelMap.ProductValue}"><text/></field>
>
>