aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/test/models
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-06-23 13:37:39 -0700
committerJosé Valim <jose.valim@gmail.com>2011-06-23 13:37:39 -0700
commit4389fc9733835186cf92a72e0dd419ac6caa023c (patch)
treeeff11fddee54d360522a6dc8034229b61cda41ff /activemodel/test/models
parent87d6865bf71eb3feb5831ca541f3493aa36ee88e (diff)
parentee044ea5477b4af41d2c0cebb13e47600da7493a (diff)
downloadrails-4389fc9733835186cf92a72e0dd419ac6caa023c.tar.gz
rails-4389fc9733835186cf92a72e0dd419ac6caa023c.tar.bz2
rails-4389fc9733835186cf92a72e0dd419ac6caa023c.zip
Merge pull request #1829 from wildchild/master
Allow to specify roles for mass-assignment as array
Diffstat (limited to 'activemodel/test/models')
-rw-r--r--activemodel/test/models/mass_assignment_specific.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/activemodel/test/models/mass_assignment_specific.rb b/activemodel/test/models/mass_assignment_specific.rb
index 53b37369ff..1d123fa58c 100644
--- a/activemodel/test/models/mass_assignment_specific.rb
+++ b/activemodel/test/models/mass_assignment_specific.rb
@@ -20,6 +20,14 @@ class Person
public :sanitize_for_mass_assignment
end
+class Account
+ include ActiveModel::MassAssignmentSecurity
+ attr_accessible :name, :email, :as => [:default, :admin]
+ attr_accessible :admin, :as => :admin
+
+ public :sanitize_for_mass_assignment
+end
+
class Firm
include ActiveModel::MassAssignmentSecurity
@@ -65,4 +73,4 @@ end
class TightDescendant < TightPerson
attr_accessible :phone_number
attr_accessible :super_powers, :as => :admin
-end \ No newline at end of file
+end