Skip to content

Loading…

Minor cleanups missed during mass assignment options removal from AR #7697

Merged
merged 1 commit into from

3 participants

@guilleiguaran
Ruby on Rails member

No description provided.

@vijaydev
Ruby on Rails member

can you do a squash ?

@guilleiguaran
Ruby on Rails member

@vijaydev done :)

@carlosantoniodasilva carlosantoniodasilva merged commit 8b2cbb3 into rails:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 19, 2012
  1. @guilleiguaran

    Remove unused private method AR::NestedAttributes#unassignable_keys a…

    guilleiguaran committed
    …nd reference to mass_assignment options
Showing with 1 addition and 5 deletions.
  1. +1 −5 activerecord/lib/active_record/nested_attributes.rb
View
6 activerecord/lib/active_record/nested_attributes.rb
@@ -320,7 +320,7 @@ def _destroy
# If the given attributes include a matching <tt>:id</tt> attribute, or
# update_only is true, and a <tt>:_destroy</tt> key set to a truthy value,
# then the existing record will be marked for destruction.
- def assign_nested_attributes_for_one_to_one_association(association_name, attributes, assignment_opts = {})
+ def assign_nested_attributes_for_one_to_one_association(association_name, attributes)
options = self.nested_attributes_options[association_name]
attributes = attributes.with_indifferent_access
@@ -469,9 +469,5 @@ def call_reject_if(association_name, attributes)
def raise_nested_attributes_record_not_found(association_name, record_id)
raise RecordNotFound, "Couldn't find #{self.class.reflect_on_association(association_name).klass.name} with ID=#{record_id} for #{self.class.name} with ID=#{id}"
end
-
- def unassignable_keys(assignment_opts)
- UNASSIGNABLE_KEYS
- end
end
end
Something went wrong with that request. Please try again.