Skip to content

Commit 61748d7

Browse files
committed
3.0-3.2 seem to work now.
1 parent 7997a36 commit 61748d7

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

lib/closure_tree/hierarchy_maintenance.rb

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,19 +104,28 @@ def _ct_reset
104104
end
105105
end
106106

107-
module RailsAssociationReset
107+
module Rails3AssociationReset
108108
def _ct_reset
109109
@association.reset
110+
@association.reset_scope
111+
end
112+
end
113+
114+
module Rails4AssociationReset
115+
def _ct_reset
116+
reset
110117
end
111118
end
112119

113120
# Horrible monkeypatch to address https://github.com/mceachen/closure_tree/issues/68
114121
AR_MAJ_MIN_VER = [ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR].join('.')
115122
case AR_MAJ_MIN_VER
116-
when '3.0', '4.0'
117-
ActiveRecord::Associations::CollectionAssociation.send(:include, ClosureTree::RailsReset)
123+
when '3.0'
124+
ActiveRecord::Associations::AssociationCollection.send(:include, ClosureTree::RailsReset)
118125
when '3.1', '3.2'
119-
ActiveRecord::Associations::CollectionProxy.send(:include, ClosureTree::RailsAssociationReset)
126+
ActiveRecord::Associations::CollectionProxy.send(:include, ClosureTree::Rails3AssociationReset)
127+
when '4.0'
128+
ActiveRecord::Associations::CollectionProxy.send(:include, ClosureTree::Rails4AssociationReset)
120129
else
121130
raise "#{AR_MAJ_MIN_VER} is not supported (yet?)"
122131
end

0 commit comments

Comments
 (0)