fix for convert date to selected timezone (MID-7391)

Evolveum · Nov 8, 2021 · dfd1e1e · dfd1e1e
1 parent df4ef8a
commit dfd1e1e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DateInput.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DateInput.java
@@ -10,6 +10,7 @@
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnChangeAjaxFormUpdatingBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.datetime.PatternDateConverter;
 import org.apache.wicket.datetime.markup.html.form.DateTextField;
 import org.apache.wicket.extensions.yui.calendar.DateTimeField;
 import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -46,7 +47,8 @@ protected DateTextField newDateTextField(String id, PropertyModel dateFieldModel
         if (localizedDatePattern != null && !localizedDatePattern.contains("yyyy")){
             localizedDatePattern = localizedDatePattern.replaceAll("yy", "yyyy");
         }
-        DateTextField dateField = DateTextField.forDatePattern(id, dateFieldModel, localizedDatePattern);
+        DateTextField dateField = DateTextField.withConverter(
+                id, dateFieldModel,  new PatternDateConverter(localizedDatePattern, false));
         dateField.add(new EmptyOnChangeAjaxFormUpdatingBehavior(){
             @Override
             protected void onUpdate(AjaxRequestTarget target){