aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model/mass_assignment_security.rb
diff options
context:
space:
mode:
authorFabio Yamate <fabioyamate@gmail.com>2012-02-14 16:27:19 -0200
committerFabio Yamate <fabioyamate@gmail.com>2012-02-15 11:13:54 -0200
commitd204918f9190afcf5f3f53adb957ca15aa644704 (patch)
treec19d64490782c36770979f59129baaf19ff08447 /activemodel/lib/active_model/mass_assignment_security.rb
parent2f9e47713051e211a1866bb8e7af3151e70a9ba0 (diff)
downloadrails-d204918f9190afcf5f3f53adb957ca15aa644704.tar.gz
rails-d204918f9190afcf5f3f53adb957ca15aa644704.tar.bz2
rails-d204918f9190afcf5f3f53adb957ca15aa644704.zip
Fix sanitize_for_mass_assigment when role is nil
There is an example in Rails documentation that suggests implementing assign_attributes method for ActiveModel interface, that by default sends option role with nil. Since mass_assignment_authorizer never is called without args, we can move the default value internally.
Diffstat (limited to 'activemodel/lib/active_model/mass_assignment_security.rb')
-rw-r--r--activemodel/lib/active_model/mass_assignment_security.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activemodel/lib/active_model/mass_assignment_security.rb b/activemodel/lib/active_model/mass_assignment_security.rb
index 13495d6786..95de039676 100644
--- a/activemodel/lib/active_model/mass_assignment_security.rb
+++ b/activemodel/lib/active_model/mass_assignment_security.rb
@@ -226,12 +226,12 @@ module ActiveModel
protected
- def sanitize_for_mass_assignment(attributes, role = :default)
+ def sanitize_for_mass_assignment(attributes, role = nil)
_mass_assignment_sanitizer.sanitize(attributes, mass_assignment_authorizer(role))
end
- def mass_assignment_authorizer(role = :default)
- self.class.active_authorizer[role]
+ def mass_assignment_authorizer(role)
+ self.class.active_authorizer[role || :default]
end
end
end