Merge pull request #3013 from AlchemyCMS/backport/6.1-stable/pr-3002

[6.1] Allow to set input_type on Datetime ingredient editor
AlchemyCMS · Sep 4, 2024 · 27874a1 · 27874a1
2 parents 0e5fa6a + 8e374a5
commit 27874a1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/app/views/alchemy/ingredients/_datetime_editor.html.erb b/app/views/alchemy/ingredients/_datetime_editor.html.erb
@@ -7,7 +7,8 @@
       datetime_editor, :value, {
         name: datetime_editor.form_field_name,
         id: datetime_editor.form_field_id,
-        value: datetime_editor.value
+        value: datetime_editor.value,
+        type: datetime_editor.settings[:input_type]
       }
     ) %>
   <% end %>

diff --git a/spec/dummy/config/alchemy/elements.yml b/spec/dummy/config/alchemy/elements.yml
@@ -167,6 +167,8 @@
     - role: datetime
       type: Datetime
       hint: true
+      settings:
+        input_type: datetime
     - role: file
       type: File
       hint: true

diff --git a/spec/views/alchemy/ingredients/datetime_editor_spec.rb b/spec/views/alchemy/ingredients/datetime_editor_spec.rb
@@ -17,6 +17,6 @@
 
   it "renders a datepicker" do
     render element_editor
-    expect(rendered).to have_css('input[type="text"][data-datepicker-type="date"].date')
+    expect(rendered).to have_css('input[type="text"][data-datepicker-type="datetime"].datetime')
   end
 end