github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-05 12:44:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rails 4 updates

Browse Source
This commit is contained in:
Stephan Kaag
2013-07-23 20:42:52 +02:00
parent 0a7bbb08e1
commit f99acebdaa
10 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/trashable.rb
View File

@ -15,13 +15,21 @@ module Trashable
#
# with this in place Post.limit(10).with_deleted, will work as expected
#
scope = self.scoped.with_default_scope
if rails4?
scope = self.all.with_default_scope
else
scope = self.scoped.with_default_scope
end
scope.where_values.delete(with_deleted_scope_sql)
scope
end
def with_deleted_scope_sql
scoped.table[:deleted_at].eq(nil).to_sql
if rails4?
all.table[:deleted_at].eq(nil).to_sql
else
scoped.table[:deleted_at].eq(nil).to_sql
end
end
end