You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by pr...@apache.org on 2016/06/01 13:45:22 UTC
svn commit: r1746466 - in
/ofbiz/branches/release15.12/specialpurpose/projectmgr:
webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
widget/forms/TimeSheetForms.xml
Author: pranayp
Date: Wed Jun 1 13:45:22 2016
New Revision: 1746466
URL: http://svn.apache.org/viewvc?rev=1746466&view=rev
Log:
I am sorry, reverting some unwanted changes mistakenly committed at r1746465.
Modified:
ofbiz/branches/release15.12/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
ofbiz/branches/release15.12/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
Modified: ofbiz/branches/release15.12/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy?rev=1746466&r1=1746465&r2=1746466&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy (original)
+++ ofbiz/branches/release15.12/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy Wed Jun 1 13:45:22 2016
@@ -78,7 +78,6 @@ day0Total = 0.00; day1Total=0.00; day2To
pHours = 0.00;
timeEntry = null;
lastTimeEntry = null;
-workEffortId = null;
// retrieve work effort data when the workeffortId has changed.
void retrieveWorkEffortData() {
@@ -206,5 +205,4 @@ timesheetsDb.each { timesheetDb ->
timesheet.hours = hours;
timesheets.add(timesheet);
}
-context.timesheets = timesheets;
-context.workEffortId = workEffortId;
\ No newline at end of file
+context.timesheets = timesheets;
\ No newline at end of file
Modified: ofbiz/branches/release15.12/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=1746466&r1=1746465&r2=1746466&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Wed Jun 1 13:45:22 2016
@@ -206,7 +206,9 @@
<form name="QuickCreateTimeEntry" target="createQuickTimeEntry" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<actions>
- <entity-one entity-name="WorkEffort" value-field="workEffortId"/>
+ <entity-one entity-name="WorkEffort">
+ <field-map field-name="workEffortId" from-field=""/>
+ </entity-one>
</actions>
<field name="timesheetId" map-name="currentTimesheet"><hidden/></field>
<field name="partyId" map-name="userLogin"><hidden/></field>