diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2012-09-12 11:35:05 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2012-09-16 23:59:05 -0500 |
| commit | 2d7ae1b08ee2a10b12cbfeef3a6cc6da55b57df6 (patch) | |
| tree | ab1f52a552683df0ca320be0356bc73c4081c890 /activerecord/test/models | |
| parent | 6ae93a0fdf457fb964149c976e7da734a548cec3 (diff) | |
| download | rails-2d7ae1b08ee2a10b12cbfeef3a6cc6da55b57df6.tar.gz rails-2d7ae1b08ee2a10b12cbfeef3a6cc6da55b57df6.tar.bz2 rails-2d7ae1b08ee2a10b12cbfeef3a6cc6da55b57df6.zip | |
Remove mass_assignment_options from ActiveRecord
Diffstat (limited to 'activerecord/test/models')
| -rw-r--r-- | activerecord/test/models/bulb.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/models/bulb.rb b/activerecord/test/models/bulb.rb index 967f733fe3..e4c0278c0d 100644 --- a/activerecord/test/models/bulb.rb +++ b/activerecord/test/models/bulb.rb @@ -18,12 +18,12 @@ class Bulb < ActiveRecord::Base self[:color] = color.upcase + "!" end - def self.new(attributes = {}, options = {}, &block) + def self.new(attributes = {}, &block) bulb_type = (attributes || {}).delete(:bulb_type) - if options && options[:as] == :admin && bulb_type.present? + if bulb_type.present? bulb_class = "#{bulb_type.to_s.camelize}Bulb".constantize - bulb_class.new(attributes, options, &block) + bulb_class.new(attributes, &block) else super end |