svn commit: r1335948 - in /ofbiz/branches/release12.04: ./ specialpurpose/projectmgr/widget/forms/ProjectForms.xml

Author: jleroux
Date: Wed May  9 07:17:02 2012
New Revision: 1335948

URL: http://svn.apache.org/viewvc?rev=1335948&view=rev
Log:
"Applied fix from trunk for revision: 1335946  "
------------------------------------------------------------------------
r1335946 | jleroux | 2012-05-09 09:15:19 +0200 (mer., 09 mai 2012) | 3 lines

A patch from Pierre Smits "Project resources overview shows button when thruDate < nowTimestamp" https://issues.apache.org/jira/browse/OFBIZ-4858

The 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/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1335946

Modified: ofbiz/branches/release12.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=1335948&r1=1335947&r2=1335948&view=diff
==============================================================================
--- ofbiz/branches/release12.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/branches/release12.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Wed May  9 07:17:02 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 &gt; 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">