diff options
| author | José Valim <jose.valim@gmail.com> | 2012-03-03 11:07:49 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-03-03 11:07:49 -0800 |
| commit | ecf4db15bc6d6574ce93b1658435e162c09d80a1 (patch) | |
| tree | fb3ac66c3a3b78b57485eb49696352e3eb03037e /actionpack/lib | |
| parent | 833181f5983bf77cfe359af6fcb9ede5fb8151f8 (diff) | |
| parent | 4e8fbc0c229327b1d2986c30faa497f699a4b122 (diff) | |
| download | rails-ecf4db15bc6d6574ce93b1658435e162c09d80a1.tar.gz rails-ecf4db15bc6d6574ce93b1658435e162c09d80a1.tar.bz2 rails-ecf4db15bc6d6574ce93b1658435e162c09d80a1.zip | |
Merge pull request #5246 from lest/patch-2
simplify namespace assignment in fields_for
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 53ae8b66da..7492ef56c6 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -1016,7 +1016,7 @@ module ActionView fields_options, record_object = record_object, nil if record_object.is_a?(Hash) && record_object.extractable_options? fields_options[:builder] ||= options[:builder] fields_options[:parent_builder] = self - fields_options[:namespace] = fields_options[:parent_builder].options[:namespace] + fields_options[:namespace] = options[:namespace] case record_name when String, Symbol |