fixes after review

ibexa · Feb 24, 2025 · 88e45d4 · 88e45d4
1 parent db26490
commit 88e45d4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/bundle/Resources/public/js/scripts/admin.picker.js b/src/bundle/Resources/public/js/scripts/admin.picker.js
@@ -5,6 +5,11 @@
     const pickers = doc.querySelectorAll(SELECTOR_PICKER);
     const { formatShortDateTime, convertDateToTimezone, getBrowserTimezone } = ibexa.helpers.timezone;
     const userTimezone = ibexa.adminUiConfig.timezone;
+    const pickerConfig = {
+        enableTime: true,
+        time_24hr: true,
+        formatDate: (date) => formatShortDateTime(date, null),
+    };
     const updateInputValue = (formInput, timestamp) => {
         if (timestamp !== formInput.value) {
             formInput.value = timestamp ?? '';
@@ -16,13 +21,7 @@
         const formInput = field.querySelector(SELECTOR_FORM_INPUT);
         const pickerInput = field.querySelector(SELECTOR_PICKER_INPUT);
         const customConfig = JSON.parse(pickerInput.dataset.flatpickrConfig || '{}');
-        const enableTime = formInput.dataset.seconds !== undefined;
         const enableSeconds = formInput.dataset.seconds === '1';
-        const pickerConfig = {
-            enableTime,
-            time_24hr: true,
-            formatDate: (date) => formatShortDateTime(date, null),
-        };
         let defaultDate;
 
         if (formInput.value) {
@@ -40,7 +39,7 @@
             flatpickrConfig: {
                 ...pickerConfig,
                 defaultDate,
-                ...(enableTime && { enableSeconds }),
+                enableSeconds,
                 ...customConfig,
             },
         });

diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
@@ -257,9 +257,10 @@
 {%- endblock -%}
 
 {%- block date_time_picker_widget -%}
+    {%- set additional_input_attr = input_attr|default([])  -%}
     <div class="ibexa-picker">
         {% include '@ibexadesign/ui/component/inputs/input_date_time_picker.html.twig' with {
-            input_attr: { class: 'ibexa-picker__input' },
+            input_attr: additional_input_attr|merge({ class: 'ibexa-picker__input' }),
             is_disabled: attr.disabled|default(false),
         } %}
         {% set attr = attr|merge({ 'hidden': true, 'class': 'ibexa-picker__form-input' }) %}