aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/form_helper.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-20 09:36:02 -0800
committerJosé Valim <jose.valim@gmail.com>2011-12-20 09:36:02 -0800
commit6bb4ad3868b0605ec43dbab5a489563c5909e828 (patch)
treecefd88f552b38076a9fb3080fc54b206bcb5cb06 /actionpack/lib/action_view/helpers/form_helper.rb
parent7ab47751068c6480e7e44fc9265a7e690dd4af3b (diff)
parent92088131ac15734f2227e9d85ea751e3f89b0116 (diff)
downloadrails-6bb4ad3868b0605ec43dbab5a489563c5909e828.tar.gz
rails-6bb4ad3868b0605ec43dbab5a489563c5909e828.tar.bz2
rails-6bb4ad3868b0605ec43dbab5a489563c5909e828.zip
Merge pull request #4033 from nashby/date-helper-field-error-proc
add failing tests for issue #3487
Diffstat (limited to 'actionpack/lib/action_view/helpers/form_helper.rb')
-rw-r--r--actionpack/lib/action_view/helpers/form_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index ccb2275329..ffb5a729ed 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -2,6 +2,7 @@ require 'cgi'
require 'action_view/helpers/date_helper'
require 'action_view/helpers/tag_helper'
require 'action_view/helpers/form_tag_helper'
+require 'action_view/helpers/active_model_helper'
require 'active_support/core_ext/class/attribute'
require 'active_support/core_ext/hash/slice'
require 'active_support/core_ext/module/method_names'
@@ -963,7 +964,7 @@ module ActionView
end
class InstanceTag
- include Helpers::TagHelper, Helpers::FormTagHelper
+ include Helpers::ActiveModelInstanceTag, Helpers::TagHelper, Helpers::FormTagHelper
attr_reader :object, :method_name, :object_name