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/11/06 21:07:12 UTC
svn commit: r711956 - in /ofbiz/trunk/specialpurpose/projectmgr:
webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
widget/forms/TimeSheetForms.xml
Author: hansbak
Date: Thu Nov 6 12:07:00 2008
New Revision: 711956
URL: http://svn.apache.org/viewvc?rev=711956&view=rev
Log:
correct wrong link and remove debug message
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy?rev=711956&r1=711955&r2=711956&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy Thu Nov 6 12:07:00 2008
@@ -172,7 +172,6 @@
entry.total = day0Total + day1Total + day2Total + day3Total + day4Total + day5Total + day6Total;
entries.add(entry);
}
-Debug.log("=====entries: " + entries);
context.timeEntries = entries;
// get all timesheets of this user, including the planned hours
timesheetsDb = delegator.findByAnd("Timesheet", ["partyId" : partyId], ["fromDate DESC"]);
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=711956&r1=711955&r2=711956&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Thu Nov 6 12:07:00 2008
@@ -76,7 +76,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}StatusToComplete?timesheetId=${timesheetId}&statusId=TIMESHEET_COMPLETED"
+ <hyperlink target="${my}TimeSheetStatusToComplete?timesheetId=${timesheetId}&statusId=TIMESHEET_COMPLETED"
description="${bsh:statusId.equals("TIMESHEET_IN_PROCESS")?complete:""}" also-hidden="false"/>
</field>
</form>
@@ -125,7 +125,7 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
<!--field name="comments" title="${uiLabelMap.CommonComments}"><display/></field-->
<field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
- <hyperlink target="TimesheetToComplete?timesheetId=${timesheetId}&statusId=TIMESHEET_COMPLETED"
+ <hyperlink target="TimeSheetStatusToComplete?timesheetId=${timesheetId}&statusId=TIMESHEET_COMPLETED"
description="${bsh:statusId.equals("TIMESHEET_IN_PROCESS")?complete:""}" also-hidden="false"/>
</field>
</form>