RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug #1485: Call model.initEdit to ensure proxies are initialized before loading

Browse source 
monthly timesheet screen.

FEA: ItEr76S04BugFixing
This commit is contained in:
Jacobo Aragunde Pérez 2012-07-09 17:41:30 +02:00
parent de6b8dbf72
commit 98d3152631
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libreplan-webapp/src/main/java/org/libreplan/web/workreports/IWorkReportModel.java
View file

@ -243,4 +243,6 @@ public interface IWorkReportModel extends IIntegrationEntityModel {
*/
boolean isMonthlyTimesheet(WorkReport workReport);
WorkReportLine getFirstWorkReportLine();
}

3
libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java
View file

@ -630,7 +630,8 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
}
private void goToEditMonthlyTimeSheet(WorkReport workReport) {
Date date = workReport.getWorkReportLines().iterator().next().getDate();
workReportModel.initEdit(workReport);
Date date = workReportModel.getFirstWorkReportLine().getDate();
Resource resource = workReport.getResource();
monthlyTimesheetController.goToCreateOrEditFormForResource(
LocalDate.fromDateFields(date), resource);

5
libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java
View file

@ -639,4 +639,9 @@ public class WorkReportModel extends IntegrationEntityModel implements
}
}
@Override
public WorkReportLine getFirstWorkReportLine() {
return workReport.getWorkReportLines().iterator().next();
}
}