isoron/wikiufc
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrading acts_as_paranoid to HEAD

Browse Source
This commit is contained in:
Alinson S. Xavier
2013-07-11 17:45:25 -04:00
parent ab4d1fe0f7
commit 589678d97f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/plugins/acts_as_paranoid/init.rb vendored
View File

@@ -1,7 +1,7 @@
class << ActiveRecord::Base class << ActiveRecord::Base
def belongs_to_with_deleted(association_id, options = {}) def belongs_to_with_deleted(association_id, options = {})
with_deleted = options.delete :with_deleted with_deleted = options.delete :with_deleted
returning belongs_to_without_deleted(association_id, options) do belongs_to_without_deleted(association_id, options).tap do
if with_deleted if with_deleted
reflection = reflect_on_association(association_id) reflection = reflect_on_association(association_id)
association_accessor_methods(reflection, Caboose::Acts::BelongsToWithDeletedAssociation) association_accessor_methods(reflection, Caboose::Acts::BelongsToWithDeletedAssociation)
@@ -13,7 +13,7 @@ class << ActiveRecord::Base
def has_many_without_deleted(association_id, options = {}, &extension) def has_many_without_deleted(association_id, options = {}, &extension)
with_deleted = options.delete :with_deleted with_deleted = options.delete :with_deleted
returning has_many_with_deleted(association_id, options, &extension) do has_many_with_deleted(association_id, options, &extension).tap do
if options[:through] && !with_deleted if options[:through] && !with_deleted
reflection = reflect_on_association(association_id) reflection = reflect_on_association(association_id)
collection_reader_method(reflection, Caboose::Acts::HasManyThroughWithoutDeletedAssociation) collection_reader_method(reflection, Caboose::Acts::HasManyThroughWithoutDeletedAssociation)