From 32e6133795c5bbd0d2cf07569e5cce7259f7b56d Mon Sep 17 00:00:00 2001 From: zpaulovics Date: Tue, 2 Jun 2015 13:56:43 +0200 Subject: [PATCH 1/2] Fix the custom options handling bug. --- lib/generators/templates/inputs/date_picker_input.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 From 7451e153dc4b9caf1e697c7d90df01b717bdb88a Mon Sep 17 00:00:00 2001 From: zpaulovics Date: Tue, 2 Jun 2015 13:57:36 +0200 Subject: [PATCH 2/2] Bump the version to 4.7.16 --- lib/datetimepicker-rails/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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