diff --git a/CHANGELOG.md b/CHANGELOG.md index e7a8e52c5..7e6850949 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ ### Bugfixes -* Your contribution here! +* [#284] [#300] Field's help message is displayed, even while inline error message is displayed. - [@antpaw](https://github.com/antpaw) ## [5.0.0][] (2021-11-11) diff --git a/lib/bootstrap_form/components/hints.rb b/lib/bootstrap_form/components/hints.rb index 93d10aac6..0b4868a5a 100644 --- a/lib/bootstrap_form/components/hints.rb +++ b/lib/bootstrap_form/components/hints.rb @@ -8,7 +8,7 @@ module Hints private def generate_help(name, help_text) - return if help_text == false || inline_error?(name) + return if help_text == false help_klass ||= "form-text text-muted" help_text ||= get_help_text_by_i18n_key(name) diff --git a/test/bootstrap_form_group_test.rb b/test/bootstrap_form_group_test.rb index 96ef72080..fa127b582 100644 --- a/test/bootstrap_form_group_test.rb +++ b/test/bootstrap_form_group_test.rb @@ -485,6 +485,7 @@ class BootstrapFormGroupTest < ActionView::TestCase