diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-07-17 14:42:57 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-07-17 14:43:06 -0700 |
commit | 0fedae636ed1e8c4c63e8e6a25644c8838f3613a (patch) | |
tree | 6b5e7d2909c931970b28240af680b85291dd0e0d /actionpack | |
parent | d3ec5c982aee9e30ba770fe9a40081d854064b8e (diff) | |
download | rails-0fedae636ed1e8c4c63e8e6a25644c8838f3613a.tar.gz rails-0fedae636ed1e8c4c63e8e6a25644c8838f3613a.tar.bz2 rails-0fedae636ed1e8c4c63e8e6a25644c8838f3613a.zip |
push fields_for_style? in to a protected method
this way we don't need to call `to_unsafe_h` to get access to ask
questions about the underlying hash
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/lib/action_controller/metal/strong_parameters.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb index 1f10fb3bbe..06d625e4d5 100644 --- a/actionpack/lib/action_controller/metal/strong_parameters.rb +++ b/actionpack/lib/action_controller/metal/strong_parameters.rb @@ -540,6 +540,10 @@ module ActionController @permitted = new_permitted end + def fields_for_style? + @parameters.all? { |k, v| k =~ /\A-?\d+\z/ && v.is_a?(Hash) } + end + private def new_instance_with_inherited_permitted_status(hash) self.class.new(hash).tap do |new_instance| @@ -570,7 +574,7 @@ module ActionController when Array object.grep(Parameters).map { |el| yield el }.compact when Parameters - if fields_for_style?(object) + if object.fields_for_style? hash = object.class.new object.each { |k,v| hash[k] = yield v } hash @@ -580,10 +584,6 @@ module ActionController end end - def fields_for_style?(object) - object.to_unsafe_h.all? { |k, v| k =~ /\A-?\d+\z/ && v.is_a?(Hash) } - end - def unpermitted_parameters!(params) unpermitted_keys = unpermitted_keys(params) if unpermitted_keys.any? |