Permalink
Browse files

Merged PR #577

  • Loading branch information...
1 parent 88bc9de commit b29c5d30d55294687c207699793c3678edb513c5 Sijawusz Pur Rahnama committed Mar 19, 2012
Showing with 4 additions and 1 deletion.
  1. +3 −0 lib/cancan/controller_additions.rb
  2. +1 −1 lib/cancan/controller_resource.rb
@@ -112,6 +112,9 @@ def load_and_authorize_resource(*args)
# [:+prepend+]
# Passing +true+ will use prepend_before_filter instead of a normal before_filter.
#
+ # [:+assignment+]
+ # Passing to ActiveRecord for support Mass-Assignment Role
+ #
def load_resource(*args)
cancan_resource_class.add_before_filter(self, :load_resource, *args)
end
@@ -82,7 +82,7 @@ def load_collection
end
def build_resource
- resource = resource_base.new(@params[name] || {})
+ resource = resource_base.new(@params[name] || {}, :as => @options[:assignment])
resource.send("#{parent_name}=", parent_resource) if @options[:singleton] && parent_resource
initial_attributes.each do |attr_name, value|
resource.send("#{attr_name}=", value)

0 comments on commit b29c5d3

Please sign in to comment.