Author: hansbak
Date: Sat Apr 25 03:44:37 2009
New Revision: 768461
URL:
http://svn.apache.org/viewvc?rev=768461&view=revLog:
Applied fix from trunk for revision: 767788
Modified:
ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
Modified: ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=768461&r1=768460&r2=768461&view=diff==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Sat Apr 25 03:44:37 2009
@@ -161,6 +161,7 @@
<set field="tabButtonItem" value="edittimesheet"/>
<set field="labelTitleProperty" value="PageTitleAddTimesheet"/>
<set field="my" value="My"/><!-- change link and target -->
+ <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonMyTimeDecorator" location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=768461&r1=768460&r2=768461&view=diff==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Sat Apr 25 03:44:37 2009
@@ -82,7 +82,7 @@
<field name="hours"><display/></field>
<field name="comments" title="${uiLabelMap.CommonComments}"><display/></field>
<field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
- <hyperlink target="${my}TimeSheetStatusToComplete" description="${statusId.equals("TIMESHEET_IN_PROCESS")?complete:""}" also-hidden="false">
+ <hyperlink target="TimeSheetStatusToComplete" description="${groovy:statusId.equals("TIMESHEET_IN_PROCESS")?complete:""}" also-hidden="false">
<parameter param-name="timesheetId"/>
<parameter param-name="statusId" value="TIMESHEET_COMPLETED"/>
</hyperlink>