Author: hansbak
Date: Tue Sep 1 04:55:55 2009
New Revision: 809811
URL:
http://svn.apache.org/viewvc?rev=809811&view=revLog:
related party communication events not listed properly
Modified:
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=809811&r1=809810&r2=809811&view=diff==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml Tue Sep 1 04:55:55 2009
@@ -73,11 +73,11 @@
<set field="tabButtonItem" value="PartyCommEvents"/>
<set field="subTabButtonItem" value="CommunicationEvent"/>
<set field="partyId" value="${parameters.partyId}"/>
- <set field="partyIdFrom" value="${parameters.partyIdFrom}" default-value="${parameters.partyId}"/>
- <set field="partyIdTo" value="${parameters.partyIdTo}" default-value="${parameters.partyId}"/>
<entity-condition entity-name="CommunicationEventAndRole" list="commEvents">
- <condition-list combine="and">
+ <condition-list combine="or">
<condition-expr field-name="partyId" operator="equals" value="${partyId}"/>
+ <condition-expr field-name="partyIdFrom" operator="equals" value="${partyId}"/>
+ <condition-expr field-name="partyIdTo" operator="equals" value="${partyId}"/>
</condition-list>
<order-by field-name="-entryDate"/>
</entity-condition>
@@ -91,7 +91,7 @@
</condition>
<widgets>
<container style="h1"><label text="${uiLabelMap.PageTitleListCommunications}"/></container>
- <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListPartyCommEvents"/>
+ <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListCommEvents"/>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>