Author: jleroux
Date: Tue Jun 28 16:13:21 2016
New Revision: 1750543
URL: http://svn.apache.org/viewvc?rev=1750543&view=rev
Log:
Completes and closes "Use 'conditionFields' instead of 'andCondition' in Lookup
screen" - https://issues.apache.org/jira/browse/OFBIZ-7655
In order to improve a little the readability, we can replace the use of direct
call of groovy in Lookup screen for the autocompletion parameters. Instead, we
can use the field 'conditionFields', which is a map key/value, to declare those
parameters.
I found 2 remaining occurrences, this fixes them in one shoot, as I suggested
in the main Jira (OFBIZ-7655)
Modified:
ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml
ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml
Modified: ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml?rev=1750543&r1=1750542&r2=1750543&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml Tue Jun 28
16:13:21 2016
@@ -92,7 +92,8 @@ under the License.
<set field="viewSize" from-field="parameters.VIEW_SIZE"
type="Integer" default-value="${viewSizeDefaultValue}"/>
<set field="entityName" value="OrderHeaderAndShipGroups"/>
<set field="searchFields" value="[orderId, orderName,
toName]"/>
- <set field="andCondition" value="${groovy: return
org.ofbiz.entity.condition.EntityCondition.makeCondition(org.ofbiz.base.util.UtilMisc.toMap('orderTypeId',
'PURCHASE_ORDER', 'roleTypeId', 'SHIP_FROM_VENDOR'))}"/>
+ <set field="conditionFields.orderTypeId"
value="PURCHASE_ORDER"/>
+ <set field="conditionFields.roleTypeId"
value="SHIP_FROM_VENDOR"/>
</actions>
<widgets>
<decorator-screen name="LookupDecorator"
location="component://common/widget/CommonScreens.xml">
Modified: ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml?rev=1750543&r1=1750542&r2=1750543&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml Tue Jun
28 16:13:21 2016
@@ -210,7 +210,7 @@ under the License.
<set field="entityName" value="SupplierProductAndProduct"/>
<set field="searchFields" value="[productId, partyId,
brandName, internalName]"/>
<set field="searchDistinct" value="true" type="Boolean"/>
- <set field="andCondition" value="${groovy: return
org.ofbiz.entity.condition.EntityCondition.makeCondition(org.ofbiz.base.util.UtilMisc.toMap('partyId',
parameters.partyId))}"/>
+ <set field="conditionFields.partyId"
from-field="parameters.partyId" />
</actions>
<widgets>
<decorator-screen name="LookupDecorator"
location="component://common/widget/CommonScreens.xml">
