[syncope] branch 2_1_X updated: [SYNCOPE-1604] short date years represented by 4 digits (#228)

[il...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/2_1_X by this push:
     new 1cec965  [SYNCOPE-1604] short date years represented by 4 digits (#228)
1cec965 is described below

commit 1cec965d18153f70b3f3eb2c4e3c93a2780c2177
Author: Cristian Capozucco <cr...@gmail.com>
AuthorDate: Wed Nov 25 16:19:36 2020 +0100

    [SYNCOPE-1604] short date years represented by 4 digits (#228)
---
 .../console/wicket/markup/html/form/AjaxDateTimeFieldPanel.java  | 9 ++++++++-
 .../test/java/org/apache/syncope/fit/console/UsersITCase.java    | 5 -----
 2 files changed, 8 insertions(+), 6 deletions(-)

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 955d64c..37318cf 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
@@ -19,7 +19,11 @@
 package org.apache.syncope.client.console.wicket.markup.html.form;
 
 import com.googlecode.wicket.kendo.ui.form.datetime.AjaxDateTimePicker;
+
+import java.text.DateFormat;
 import java.util.Date;
+
+import org.apache.commons.lang3.time.FastDateFormat;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
@@ -36,7 +40,10 @@ public class AjaxDateTimeFieldPanel extends DateFieldPanel {
 
         // 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());
+        field = new AjaxDateTimePicker("field", model, SyncopeConsoleSession.get().getLocale(),
+                FastDateFormat.getDateInstance(DateFormat.SHORT, SyncopeConsoleSession.get().getLocale()).getPattern()
+                        .replace("yy", "yyyy"),
+                FastDateFormat.getTimeInstance(DateFormat.SHORT, SyncopeConsoleSession.get().getLocale()).getPattern());
         add(field.setLabel(new ResourceModel(name, name)).setOutputMarkupId(true));
     }
 
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java
index 1507310..b7554c0 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java
@@ -628,11 +628,6 @@ public class UsersITCase extends AbstractConsoleITCase {
         cal.set(2017, Calendar.JANUARY, 19, 0, 0, 0);
         cal.set(Calendar.MILLISECOND, 0);
 
-        TESTER.assertModelValue("body:content:body:container:content:"
-                + "tabbedPanel:panel:searchResult:outerObjectsRepeater:"
-                + "0:outer:form:content:form:view:plainSchemas:tabs:0:"
-                + "body:content:schemas:1:panel:field:datepicker", cal.getTime());
-
         assertEquals(TESTER.getComponentFromLastRenderedPage("body:content:body:"
                 + "container:content:tabbedPanel:panel:searchResult:"
                 + "outerObjectsRepeater:0:outer:form:content:form:view:plainSchemas:"