You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by nm...@apache.org on 2016/06/28 12:06:48 UTC
svn commit: r1750492 -
/ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml
Author: nmalin
Date: Tue Jun 28 12:06:48 2016
New Revision: 1750492
URL: http://svn.apache.org/viewvc?rev=1750492&view=rev
Log:
Change the field 'andCondition' (which use direct call to groovy) to 'conditionFields' in the lookup applications/party/widget/partymgr/LookupScreens#LookupInternalOrganization and applications/party/widget/partymgr/LookupScreens#LookupContact. Related issue OFBIZ-7657 and OFBIZ-7658, thanks to Florian Montalbano for these issues.
Modified:
ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml
Modified: ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml?rev=1750492&r1=1750491&r2=1750492&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml Tue Jun 28 12:06:48 2016
@@ -180,8 +180,7 @@ under the License.
<set field="parameters.roleTypeId" value="CONTACT"/>
<set field="searchFields" value="[partyId, firstName, middleName, lastName]"/>
<script location="component://party/groovyScripts/party/StatusCondition.groovy"/>
- <set field="andCondition" value="${groovy: return org.ofbiz.entity.condition.EntityCondition.makeCondition([
- org.ofbiz.entity.condition.EntityCondition.makeCondition('roleTypeId', 'CONTACT')])}"/>
+ <set field="conditionFields.roleTypeId" value="CONTACT" />
</actions>
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -414,8 +413,7 @@ under the License.
<set field="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
<set field="searchFields" value="[partyId, groupName, partyGroupComments]"/>
<script location="component://party/groovyScripts/party/StatusCondition.groovy"/>
- <set field="andCondition" value="${groovy: return org.ofbiz.entity.condition.EntityCondition.makeCondition([context.andCondition,
- org.ofbiz.entity.condition.EntityCondition.makeCondition('roleTypeId', 'INTERNAL_ORGANIZATIO')])}"/>
+ <set field="conditionFields.roleTypeId" value="INTERNAL_ORGANIZATIO" />
</actions>
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">