diff options
| author | Juanjo Bazán <jjbazan@gmail.com> | 2012-10-29 11:28:27 +0100 |
|---|---|---|
| committer | Juanjo Bazán <jjbazan@gmail.com> | 2012-10-29 11:28:27 +0100 |
| commit | 20c574ca85e380d06c2e0f148301177a9b197b2e (patch) | |
| tree | a7e1fc5e47c99b30a5e4589914c8eee4c35f7b94 /actionpack/lib | |
| parent | 0d7dcdcbf4e212fd53ed6c836022db05d0a8229a (diff) | |
| parent | cd17ee5598411728747011566abf6779166be9d3 (diff) | |
| download | rails-20c574ca85e380d06c2e0f148301177a9b197b2e.tar.gz rails-20c574ca85e380d06c2e0f148301177a9b197b2e.tar.bz2 rails-20c574ca85e380d06c2e0f148301177a9b197b2e.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/metal/strong_parameters.rb | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb index 73f2e94cd1..f60d2a0a50 100644 --- a/actionpack/lib/action_controller/metal/strong_parameters.rb +++ b/actionpack/lib/action_controller/metal/strong_parameters.rb @@ -43,19 +43,6 @@ module ActionController # Person.first.update_attributes!(permitted) # # => #<Person id: 1, name: "Francesco", age: 22, role: "user"> # - # It provides a +permit_all_parameters+ option that controls the top-level - # behaviour of new instances. If it's +true+, all the parameters will be - # permitted by default. The default value for +permit_all_parameters+ - # option is +false+. - # - # params = ActionController::Parameters.new - # params.permitted? # => false - # - # ActionController::Parameters.permit_all_parameters = true - # - # params = ActionController::Parameters.new - # params.permitted? # => true - # # <tt>ActionController::Parameters</tt> is inherited from # <tt>ActiveSupport::HashWithIndifferentAccess</tt>, this means # that you can fetch values using either <tt>:key</tt> or <tt>"key"</tt>. @@ -68,8 +55,7 @@ module ActionController attr_accessor :permitted # :nodoc: # Returns a new instance of <tt>ActionController::Parameters</tt>. - # Also, sets the +permitted+ attribute to the default value of - # <tt>ActionController::Parameters.permit_all_parameters</tt>. + # Also, sets the +permitted+ attribute to +false+. # # class Person # include ActiveRecord::Base @@ -78,12 +64,6 @@ module ActionController # params = ActionController::Parameters.new(name: 'Francesco') # params.permitted? # => false # Person.new(params) # => ActiveModel::ForbiddenAttributesError - # - # ActionController::Parameters.permit_all_parameters = true - # - # params = ActionController::Parameters.new(name: 'Francesco') - # params.permitted? # => true - # Person.new(params) # => #<Person id: nil, name: "Francesco"> def initialize(attributes = nil) super(attributes) @permitted = self.class.permit_all_parameters |