File tree Expand file tree Collapse file tree 1 file changed +13
-4
lines changed Expand file tree Collapse file tree 1 file changed +13
-4
lines changed Original file line number Diff line number Diff line change @@ -104,19 +104,28 @@ def _ct_reset
104
104
end
105
105
end
106
106
107
- module RailsAssociationReset
107
+ module Rails3AssociationReset
108
108
def _ct_reset
109
109
@association . reset
110
+ @association . reset_scope
111
+ end
112
+ end
113
+
114
+ module Rails4AssociationReset
115
+ def _ct_reset
116
+ reset
110
117
end
111
118
end
112
119
113
120
# Horrible monkeypatch to address https://github.com/mceachen/closure_tree/issues/68
114
121
AR_MAJ_MIN_VER = [ ActiveRecord ::VERSION ::MAJOR , ActiveRecord ::VERSION ::MINOR ] . join ( '.' )
115
122
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 )
118
125
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 )
120
129
else
121
130
raise "#{ AR_MAJ_MIN_VER } is not supported (yet?)"
122
131
end
You can’t perform that action at this time.
0 commit comments