Author: erwan
Date: Thu Mar 29 20:18:16 2012
New Revision: 1307092
URL: http://svn.apache.org/viewvc?rev=1307092&view=rev
Log:
A patch from Pierre Smits - Assigning a resource to a task is not reflected in
the resource's tasks view - OFBIZ-3638
Modified:
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=1307092&r1=1307091&r2=1307092&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Thu Mar 29
20:18:16 2012
@@ -610,12 +610,17 @@ under the License.
<set field="tabButtonItem" value="listResourcesTask"/>
<set field="titleProperty" value="PageTitleListTaskByParty"/>
<set field="workEffortId" from-field="parameters.projectId"/>
- <entity-and entity-name="WorkEffortAndPartyAssign"
list="tasks">
- <field-map field-name="partyId"
from-field="parameters.partyId"/>
- <field-map field-name="workEffortTypeId" value="TASK"/>
- <field-map field-name="statusId"
value="PRTYASGN_ASSIGNED"/>
+ <entity-condition entity-name="WorkEffortAndPartyAssign"
list="tasks">
+ <condition-list combine="and">
+ <condition-expr field-name="partyId"
from-field="parameters.partyId"/>
+ <condition-expr field-name="workEffortTypeId"
value="TASK"/>
+ <condition-list combine="or">
+ <condition-expr field-name="statusId"
value="PRTYASGN_ASSIGNED"/>
+ <condition-expr field-name="statusId"
value="PAS_ASSIGNED"/>
+ </condition-list>
+ </condition-list>
<order-by field-name="workEffortId"/>
- </entity-and>
+ </entity-condition>
<set field="projectId" from-field="parameters.projectId"
default-value="${parameters.workEffortId}"/>
<set field="partyId" from-field="parameters.partyId"/>
</actions>
