diff --git a/lib/datetimepicker-rails/version.rb b/lib/datetimepicker-rails/version.rb index f828bac..9223fd2 100644 --- a/lib/datetimepicker-rails/version.rb +++ b/lib/datetimepicker-rails/version.rb @@ -1,5 +1,5 @@ module Datetimepicker module Rails - VERSION = "4.7.15" + VERSION = "4.7.16" end end diff --git a/lib/generators/templates/inputs/date_picker_input.rb b/lib/generators/templates/inputs/date_picker_input.rb index 18573b3..e4c34fb 100644 --- a/lib/generators/templates/inputs/date_picker_input.rb +++ b/lib/generators/templates/inputs/date_picker_input.rb @@ -53,12 +53,14 @@ def date_view_header_format def date_options_base { locale: I18n.locale.to_s, - format: picker_pattern + format: picker_pattern, + dayViewHeaderFormat: date_view_header_format } end def date_options - date_options_base.merge!({dayViewHeaderFormat: date_view_header_format}) + custom_options = input_html_options[:data][:date_options] || {} + date_options_base.merge!(custom_options) end end