Merge branch 'branches/rudder/8.0'

Normation · Nov 27, 2023 · 74f6edc · 74f6edc
2 parents 9ff97b6 + c3b8cd7
commit 74f6edc
Showing 1 changed file with 2 additions and 1 deletion.
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
@@ -579,7 +579,7 @@ case object DateComparator extends LDAPCriterionType {
   val fmt                                = "dd/MM/yyyy"
   val frenchFmt                          = DateTimeFormat.forPattern(fmt).withLocale(Locale.FRANCE)
   def error(value: String, e: Exception) = Inconsistency(
-    s"Invalide date: '${value}', expected format is: '${fmt}'. Error was: ${e.getMessage}"
+    s"Invalid date: '${value}', expected format is: '${fmt}'. Error was: ${e.getMessage}"
   )
 
   override protected def validateSubCase(v: String, comparator: CriterionComparator) = try {
@@ -591,6 +591,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'] = 'dd/mm/yy';
        $('#%s').datepicker(init);
        """.format(formId)))
   override def destroyForm(formId: String): JsCmd = OnLoad(JsRaw("""$('#%s').datepicker( "destroy" );""".format(formId)))