Repository: syncope Updated Branches: refs/heads/2_1_X 50e4b14c3 -> 5be7cdbca
[SYNCOPE-1373] cron expression is preserved while updating a scheduled task Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5be7cdbc Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5be7cdbc Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5be7cdbc Branch: refs/heads/2_1_X Commit: 5be7cdbca9f78048857676dfb1b672d7e6ad970f Parents: 50e4b14 Author: Andrea Patricelli <[email protected]> Authored: Thu Sep 20 12:40:05 2018 +0200 Committer: Andrea Patricelli <[email protected]> Committed: Thu Sep 20 12:42:06 2018 +0200 ---------------------------------------------------------------------- .../client/console/tasks/CrontabPanel.java | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/5be7cdbc/client/console/src/main/java/org/apache/syncope/client/console/tasks/CrontabPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/CrontabPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/CrontabPanel.java index a44b6de..24557f2 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/CrontabPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/CrontabPanel.java @@ -161,20 +161,20 @@ public class CrontabPanel extends Panel { public String getCronExpression() { String cronExpression = null; - if (seconds != null && seconds.getField().getInput() != null - && minutes != null && minutes.getField().getInput() != null - && hours != null && hours.getField().getInput() != null - && daysOfMonth != null && daysOfMonth.getField().getInput() != null - && months != null && months.getField().getInput() != null - && daysOfWeek != null && daysOfWeek.getField().getInput() != null) { + if (seconds != null && seconds.getModelObject() != null + && minutes != null && minutes.getModelObject() != null + && hours != null && hours.getModelObject() != null + && daysOfMonth != null && daysOfMonth.getModelObject() != null + && months != null && months.getModelObject() != null + && daysOfWeek != null && daysOfWeek.getModelObject() != null) { cronExpression = new StringBuilder(). - append(seconds.getField().getInput().trim()).append(" "). - append(minutes.getField().getInput().trim()).append(" "). - append(hours.getField().getInput().trim()).append(" "). - append(daysOfMonth.getField().getInput().trim()).append(" "). - append(months.getField().getInput().trim()).append(" "). - append(daysOfWeek.getField().getInput().trim()).toString(); + append(seconds.getField().getModelObject().trim()).append(" "). + append(minutes.getField().getModelObject().trim()).append(" "). + append(hours.getField().getModelObject().trim()).append(" "). + append(daysOfMonth.getField().getModelObject().trim()).append(" "). + append(months.getField().getModelObject().trim()).append(" "). + append(daysOfWeek.getField().getModelObject().trim()).toString(); } return StringUtils.isNotBlank(cronExpression) ? cronExpression : null;
