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

Fix issue in entry points renaming method

Browse source 
FEA: ItEr76S28UserDashboard
This commit is contained in:
Manuel Rego Casasnovas 2012-06-05 08:33:56 +02:00
parent 36e6952a80
commit b3ea221f6d
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/IMonthlyTimesheetController.java
View file

@ -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);
}

4
libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java
View file

@ -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);

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

@ -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);
}