You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/12/04 15:57:55 UTC
[syncope] branch 2_0_X updated: [SYNCOPE-1407] Passing conversion
pattern to AjaxDatePicker (but not AjaxDateTimePicker)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new 45b3f96 [SYNCOPE-1407] Passing conversion pattern to AjaxDatePicker (but not AjaxDateTimePicker)
45b3f96 is described below
commit 45b3f960e4df4a1c236daa9ea922ab3a0cb203e3
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Dec 4 16:56:57 2018 +0100
[SYNCOPE-1407] Passing conversion pattern to AjaxDatePicker (but not AjaxDateTimePicker)
---
.../org/apache/syncope/client/console/SyncopeConsoleSession.java | 4 +---
.../console/wicket/markup/html/form/AjaxDateFieldPanel.java | 2 +-
.../console/wicket/markup/html/form/AjaxDateTimeFieldPanel.java | 9 ++++++---
.../client/console/wicket/markup/html/form/DateFieldPanel.java | 2 +-
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
index 8745feb..afe96e5 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
@@ -25,7 +25,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Callable;
@@ -329,7 +328,6 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
}
public FastDateFormat getDateFormat() {
- Locale locale = getLocale() == null ? Locale.ENGLISH : getLocale();
- return FastDateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, locale);
+ return FastDateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, getLocale());
}
}
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDateFieldPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDateFieldPanel.java
index 191b2a8..78a28fd 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDateFieldPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDateFieldPanel.java
@@ -31,7 +31,7 @@ public class AjaxDateFieldPanel extends DateFieldPanel {
public AjaxDateFieldPanel(final String id, final String name, final IModel<Date> model, final String datePattern) {
super(id, name, model, datePattern);
- field = new AjaxDatePicker("field", model, SyncopeConsoleSession.get().getDateFormat().getLocale());
+ field = new AjaxDatePicker("field", model, SyncopeConsoleSession.get().getLocale(), datePattern);
add(field.setLabel(new Model<>(name)).setOutputMarkupId(true));
}
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDateTimeFieldPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDateTimeFieldPanel.java
index 04c100af..f4ad09e 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDateTimeFieldPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDateTimeFieldPanel.java
@@ -29,10 +29,13 @@ public class AjaxDateTimeFieldPanel extends DateFieldPanel {
private static final long serialVersionUID = -428975732068281726L;
public AjaxDateTimeFieldPanel(
- final String id, final String name, final IModel<Date> model, final String datePattern) {
- super(id, name, model, datePattern);
+ final String id, final String name, final IModel<Date> model, final String dateTimePattern) {
- field = new AjaxDateTimePicker("field", model, SyncopeConsoleSession.get().getDateFormat().getLocale());
+ super(id, name, model, dateTimePattern);
+
+ // dateTimePattern should be spit into separate date and time pattern strings in order to be passed to the
+ // AjaxDateTimePicker constructor, but there is no safe way to do that - ignoring
+ field = new AjaxDateTimePicker("field", model, SyncopeConsoleSession.get().getLocale());
add(field.setLabel(new Model<>(name)).setOutputMarkupId(true));
}
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/DateFieldPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/DateFieldPanel.java
index 806f09d..436f724 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/DateFieldPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/DateFieldPanel.java
@@ -127,6 +127,6 @@ public class DateFieldPanel extends FieldPanel<Date> {
public void renderHead(final IHeaderResponse response) {
super.renderHead(response);
response.render(JavaScriptHeaderItem.forReference(
- new KendoCultureResourceReference(SyncopeConsoleSession.get().getDateFormat().getLocale())));
+ new KendoCultureResourceReference(SyncopeConsoleSession.get().getLocale())));
}
}