From 56c2c783440dc3021d2b76f3b29b70fe015f8ed5 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 7 Jun 2012 12:13:08 +0200 Subject: [PATCH] Fix typo in GET parameter for saved timesheets FEA: ItEr76S28UserDashboard --- .../web/users/dashboard/MonthlyTimesheetController.java | 4 ++-- .../web/users/dashboard/UserDashboardController.java | 2 +- .../libreplan/web/workreports/WorkReportCRUDController.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 a1636347b..58c747b84 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 @@ -562,9 +562,9 @@ public class MonthlyTimesheetController extends GenericForwardComposer public void save() { monthlyTimesheetModel.save(); String url = CustomTargetUrlResolver.USER_DASHBOARD_URL - + "?timesheet_save=" + monthlyTimesheetModel.getDate(); + + "?timesheet_saved=" + monthlyTimesheetModel.getDate(); if (!monthlyTimesheetModel.isCurrentUser()) { - url = WORK_REPORTS_URL + "?timesheet_save=true"; + url = WORK_REPORTS_URL + "?timesheet_saved=true"; } Executions.getCurrent().sendRedirect(url); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java index d3d77fc15..417943795 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java @@ -52,7 +52,7 @@ public class UserDashboardController extends GenericForwardComposer { messagesForUser = new MessagesForUser(messagesContainer); String timesheetSave = Executions.getCurrent().getParameter( - "timesheet_save"); + "timesheet_saved"); if (!StringUtils.isBlank(timesheetSave)) { String monthlyTimesheet = new LocalDate(timesheetSave) .toString("MMMM y"); 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 a7e57f520..6475b7c07 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 @@ -212,7 +212,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements private void showMessageIfMonthlyTimesheetWasSaved() { String timesheetSave = Executions.getCurrent().getParameter( - "timesheet_save"); + "timesheet_saved"); if (!StringUtils.isBlank(timesheetSave)) { messagesForUser.showMessage(Level.INFO, _("Monthly timesheet saved"));