From 78ae02a1378be3b1dc2779bfdffe20b485004c21 Mon Sep 17 00:00:00 2001
From: Hakon Baunsgaard <hakonb@gmail.com>
Date: Fri, 21 Nov 2014 21:28:30 +0100
Subject: [PATCH 1/3] Made generate_help reuse the existing get_error_messages
 method to fetch error in one place

---
 lib/bootstrap_form/form_builder.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bootstrap_form/form_builder.rb b/lib/bootstrap_form/form_builder.rb
index b0a297713..29db0d97c 100644
--- a/lib/bootstrap_form/form_builder.rb
+++ b/lib/bootstrap_form/form_builder.rb
@@ -343,7 +343,7 @@ def generate_label(id, name, options, custom_label_col, group_layout)
     end
 
     def generate_help(name, help_text)
-      help_text = object.errors[name].join(", ") if has_error?(name) && inline_errors
+      help_text = get_error_messages(name) if has_error?(name) && inline_errors
       return if help_text === false
 
       help_text ||= get_help_text_by_i18n_key(name)

From dba7de95640210554adc1b996196ec0e88c4acbe Mon Sep 17 00:00:00 2001
From: Hakon Baunsgaard <hakonb@gmail.com>
Date: Sun, 30 Nov 2014 21:33:28 +0100
Subject: [PATCH 2/3] Fixed issue when specifying non-default label column span

---
 lib/bootstrap_form/form_builder.rb |  3 +--
 test/bootstrap_form_group_test.rb  | 10 ++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/bootstrap_form/form_builder.rb b/lib/bootstrap_form/form_builder.rb
index 29db0d97c..d19aaca70 100644
--- a/lib/bootstrap_form/form_builder.rb
+++ b/lib/bootstrap_form/form_builder.rb
@@ -185,9 +185,8 @@ def form_group(*args, &block)
 
         if get_group_layout(options[:layout]) == :horizontal
           control_class = (options[:control_col] || control_col.clone)
-
           unless options[:label]
-            control_offset = offset_col(/([0-9]+)$/.match(options[:label_col] || default_label_col))
+            control_offset = offset_col(/([0-9]+)$/.match(options[:label_col] || @label_col))
             control_class.concat(" #{control_offset}")
           end
           control = content_tag(:div, control, class: control_class)
diff --git a/test/bootstrap_form_group_test.rb b/test/bootstrap_form_group_test.rb
index 26d79c711..8369b6f53 100644
--- a/test/bootstrap_form_group_test.rb
+++ b/test/bootstrap_form_group_test.rb
@@ -243,4 +243,14 @@ def setup
     expected = %{<form accept-charset="UTF-8" action="/users" class="form-horizontal" id="new_user" method="post" role="form"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div><div class="form-group"><label class="control-label required" for="user_email">Email</label><input class="form-control" id="user_email" name="user[email]" type="email" value="steve@example.com" /></div></form>}
     assert_equal expected, bootstrap_form_for(@user, layout: :horizontal) { |f| f.email_field :email, layout: :inline }
   end
+
+  test "non-default column span on form is reflected in form_group" do
+    non_default_horizontal_builder = BootstrapForm::FormBuilder.new(:user, @user, self, { layout: :horizontal, label_col: "col-sm-3", control_col: "col-sm-9" })
+    output = non_default_horizontal_builder.form_group do
+      %{<p class="form-control-static">Bar</p>}.html_safe
+    end
+
+    expected = %{<div class="form-group"><div class="col-sm-9 col-sm-offset-3"><p class="form-control-static">Bar</p></div></div>}
+    assert_equal expected, output
+  end    
 end

From 078314bee99c77631d0ea5e4d96e7a1815e05064 Mon Sep 17 00:00:00 2001
From: Hakon Baunsgaard <hakonb@gmail.com>
Date: Sun, 30 Nov 2014 23:03:41 +0100
Subject: [PATCH 3/3] Added CHANGELOG entry

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4dc24aa7..8ad2c2ccc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ Bugfixes:
 
   - Use #underscore, not #downcase for help text scope (#140, @atipugin)
   - Radio button and checkbox labels will now include the disabled class as needed. (#156, @ScottSwezey)
+  - Fixed issue with setting offset in form_group without label in horizontal layout  
+    when form uses non-default label_col
 
 Features: