Author: jleroux
Date: Wed May 9 07:15:19 2012
New Revision: 1335946
URL:
http://svn.apache.org/viewvc?rev=1335946&view=revLog:
A patch from Pierre Smits "Project resources overview shows button when thruDate < nowTimestamp"
https://issues.apache.org/jira/browse/OFBIZ-4858The button to end the assignment of a resource on a project should only be shown when the thruDate is not set or when the thruDate > nowTimestamp. But the button is also shown when the thruDate < nowTimestamp.
Modified:
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=1335946&r1=1335945&r2=1335946&view=diff==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Wed May 9 07:15:19 2012
@@ -557,7 +557,7 @@
</field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
- <field name="deleteButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="deleteButton" widget-style="smallSubmit" use-when="${thruDate==null || (thruDate > nowTimestamp)}"><submit button-type="button"/></field>
</form>
<form name="AddWorkEffortPartyAssign" target="createWorkEffortPartyAssign" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">