From 620f75c031992440467eb3916ff0d60fb556ae5b Mon Sep 17 00:00:00 2001 From: Olivier Ruffin Date: Tue, 6 Jan 2015 10:46:17 +0100 Subject: [PATCH] Fix wrapper options The wrapper options must be retrieved from css_options to work for every control and it must be merged (instead of reverse_merged) because empty form_group_options values prevent a reverse_merge to work (and if we specify things in wrapper, they should always be considered as more important than default options). Fix #153 --- lib/bootstrap_form/form_builder.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bootstrap_form/form_builder.rb b/lib/bootstrap_form/form_builder.rb index d19aaca70..3f4a9c7a1 100644 --- a/lib/bootstrap_form/form_builder.rb +++ b/lib/bootstrap_form/form_builder.rb @@ -281,8 +281,8 @@ def form_group_builder(method, options, html_options = nil) options = convert_form_tag_options(method, options) if acts_like_form_tag - wrapper_class = options.delete(:wrapper_class) - wrapper_options = options.delete(:wrapper) + wrapper_class = css_options.delete(:wrapper_class) + wrapper_options = css_options.delete(:wrapper) help = options.delete(:help) icon = options.delete(:icon) label_col = options.delete(:label_col) @@ -299,7 +299,7 @@ def form_group_builder(method, options, html_options = nil) } if wrapper_options.is_a?(Hash) - form_group_options.reverse_merge!(wrapper_options) + form_group_options.merge!(wrapper_options) end unless options.delete(:skip_label)