diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/IMonthlyTimesheetController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/IMonthlyTimesheetController.java index 2fbe0efc5..6308b09e2 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/IMonthlyTimesheetController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/IMonthlyTimesheetController.java @@ -36,6 +36,6 @@ public interface IMonthlyTimesheetController { void goToCreateOrEditForm(LocalDate date); @EntryPoint({ "date", "resource" }) - void goToCreateOrEditForm(LocalDate date, Resource resource); + void goToCreateOrEditFormForResource(LocalDate date, Resource resource); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java index cc2c21def..d47ec3be0 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java @@ -441,7 +441,7 @@ public class MonthlyTimesheetController extends GenericForwardComposer } @Override - public void goToCreateOrEditForm(LocalDate date, + public void goToCreateOrEditFormForResource(LocalDate date, org.libreplan.business.resources.entities.Resource resource) { monthlyTimesheetModel.initCreateOrEdit(date, resource); initTimesheet(date); @@ -518,7 +518,7 @@ public class MonthlyTimesheetController extends GenericForwardComposer if (monthlyTimesheetModel.isCurrentUser()) { goToCreateOrEditForm(monthlyTimesheetModel.getDate()); } else { - goToCreateOrEditForm(monthlyTimesheetModel.getDate(), + goToCreateOrEditFormForResource(monthlyTimesheetModel.getDate(), monthlyTimesheetModel.getWorker()); } Util.reloadBindings(timesheet); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java index 62da330ad..a7e57f520 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java @@ -686,7 +686,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements private void goToEditMonthlyTimeSheet(WorkReport workReport) { Date date = workReport.getWorkReportLines().iterator().next().getDate(); Resource resource = workReport.getResource(); - monthlyTimesheetController.goToCreateOrEditForm( + monthlyTimesheetController.goToCreateOrEditFormForResource( LocalDate.fromDateFields(date), resource); } @@ -1970,7 +1970,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements _("Please select a worker")); } - monthlyTimesheetController.goToCreateOrEditForm( + monthlyTimesheetController.goToCreateOrEditFormForResource( LocalDate.fromDateFields(date), resource); }