You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2008/10/21 11:21:11 UTC
svn commit: r706557 - in /ofbiz/trunk/specialpurpose/projectmgr/widget:
TaskScreens.xml forms/TaskForms.xml
Author: hansbak
Date: Tue Oct 21 02:21:09 2008
New Revision: 706557
URL: http://svn.apache.org/viewvc?rev=706557&view=rev
Log:
fix dropdown when assign a task to me
Modified:
ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=706557&r1=706556&r2=706557&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Tue Oct 21 02:21:09 2008
@@ -86,7 +86,6 @@
<field-map field-name="workEffortId" value="dummy"/>
</entity-one>
<set field="myTask" value="notNull"/>
- <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonMyTaskDecorator" location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=706557&r1=706556&r2=706557&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Tue Oct 21 02:21:09 2008
@@ -286,9 +286,15 @@
header-row-style="header-row" default-table-style="basic-table">
<field name="partyId"><hidden value="${userLogin.partyId}"/></field>
<field name="statusId"><hidden value="PAS_ASSIGNED"/></field>
- <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}" parameter-name="workEffortId">
- <drop-down allow-empty="true" >
- <list-options list-name="projectTaskLists" key-name="workEffortId" description="${projectName}-${phaseName}-${workEffortName}"/>
+ <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}">
+ <drop-down allow-empty="false">
+ <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${projectName} -- ${phaseName} -- ${workEffortName}" key-field-name="workEffortId" filter-by-date="true">
+ <entity-constraint name="partyId" operator="equals" value="${parameters.userLogin.partyId}"/>
+ <entity-constraint name="currentStatusId" operator="equals" value="PTS_CREATED"/>
+ <entity-order-by field-name="projectName"/>
+ <entity-order-by field-name="phaseName"/>
+ <entity-order-by field-name="workEffortName"/>
+ </entity-options>
</drop-down>
</field>
<field name="roleTypeId">