You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2011/06/09 17:17:01 UTC
svn commit: r1133919 -
/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
Author: erwan
Date: Thu Jun 9 15:17:01 2011
New Revision: 1133919
URL: http://svn.apache.org/viewvc?rev=1133919&view=rev
Log:
Making multiple conditions more readable in EditTask form
Modified:
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=1133919&r1=1133918&r2=1133919&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Thu Jun 9 15:17:01 2011
@@ -31,7 +31,7 @@
<field name="partyId" use-when="myTask!=void"><hidden value="${userLogin.partyId}"/></field>
<field name="projectId"><hidden value="${parameters.projectId}"/></field>
<field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
- <field name="workEffortParentId" use-when="myTask==void&&projectId!=void" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}">
+ <field name="workEffortParentId" use-when="myTask==void @and projectId!=void" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}">
<drop-down allow-empty="true">
<entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${projectId}.${sequenceNum} ${workEffortName}[${workEffortId}]">
<entity-constraint name="workEffortTypeId" value="PHASE"/>
@@ -41,7 +41,7 @@
</entity-options>
</drop-down>
</field>
- <field name="workEffortParentId" use-when="myTask==void&&projectId==void" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}">
+ <field name="workEffortParentId" use-when="myTask==void @and projectId!=void" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}">
<drop-down allow-empty="true">
<entity-options entity-name="ProjectPartyAndPhase" key-field-name="phaseId" description="${projectName} -- ${phaseName}">
<entity-constraint name="partyId" env-name="userLogin.partyId"/>
@@ -50,12 +50,12 @@
</entity-options>
</drop-down>
</field>
- <field name="workEffortParentId" use-when="myTask!=void&&parameters.get("workEffortParentId")!=null" title="${uiLabelMap.ProjectMgrTaskPhase}*">
+ <field name="workEffortParentId" use-when="myTask!=void @and parameters.get("workEffortParentId")!=null" title="${uiLabelMap.ProjectMgrTaskPhase}*">
<display-entity entity-name="WorkEffort" description="${workEffortName}[${workEffortId}]" key-field-name="workEffortId">
<sub-hyperlink target="MyTasks" description="[${uiLabelMap.CommonChange}]"/>
</display-entity>
</field>
- <field name="workEffortParentId" use-when="myTask!=void&&parameters.get("workEffortParentId")==null" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}" event="onchange" action="javascript:document.EditTask.submit();">
+ <field name="workEffortParentId" use-when="myTask!=void @and parameters.get("workEffortParentId")==null" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}" event="onchange" action="javascript:document.EditTask.submit();">
<drop-down allow-empty="true">
<entity-options entity-name="ProjectPartyAndPhase" key-field-name="phaseId" description="${projectName} -- ${phaseName}">
<entity-constraint name="partyId" env-name="userLogin.partyId"/>