Work in progress

ElaadF · Nov 2, 2023 · 38e5bbf · 38e5bbf
1 parent f7a80d1
commit 38e5bbf
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...ces/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala b/...ces/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala
@@ -564,8 +564,8 @@ case object OrderedStringComparator extends TStringComparator {
 
 case object DateComparator extends LDAPCriterionType {
   override val comparators               = OrderedComparators.comparators.filterNot(c => c == Regex || c == NotRegex)
-  val fmt                                = "dd/MM/yyyy"
-  val frenchFmt                          = DateTimeFormat.forPattern(fmt).withLocale(Locale.FRANCE)
+  val fmt                                = "yyyy/MM/dd"
+  val frenchFmt                          = DateTimeFormat.forPattern(fmt).withLocale(Locale.FRENCH)
   def error(value: String, e: Exception) = Inconsistency(
     s"Invalide date: '${value}', expected format is: '${fmt}'. Error was: ${e.getMessage}"
   )
@@ -579,6 +579,7 @@ case object DateComparator extends LDAPCriterionType {
   // init a jquery datepicker
   override def initForm(formId: String): JsCmd = OnLoad(JsRaw("""var init = $.datepicker.regional['en'];
        init['showOn'] = 'focus';
+       init['dateFormat'] = 'yy/mm/dd';
        $('#%s').datepicker(init);
        """.format(formId)))
   override def destroyForm(formId: String): JsCmd = OnLoad(JsRaw("""$('#%s').datepicker( "destroy" );""".format(formId)))