diff --git a/app/models/post.rb b/app/models/post.rb index 832a7dbd6280ab21034f8d413d22a9e2945debc5..1237e68719f46444e6a0cf7729da165b686c9a78 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -85,7 +85,7 @@ class Post < ActiveRecord::Base def self.excluding_blocks(user) people = user.blocks.map{|b| b.person_id} - scope = scoped + scope = all if people.any? scope = scope.where("posts.author_id NOT IN (?)", people) @@ -95,7 +95,7 @@ class Post < ActiveRecord::Base end def self.excluding_hidden_shareables(user) - scope = scoped + scope = all if user.has_hidden_shareables_of_type? scope = scope.where('posts.id NOT IN (?)', user.hidden_shareables["#{self.base_class}"]) end diff --git a/app/models/profile.rb b/app/models/profile.rb index 83c60333563f2f1508b02bb5720c574790798fa1..e3e543f29ee052ae8c1aaa37fd1adfa3b88fd229 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -144,8 +144,8 @@ class Profile < ActiveRecord::Base if @tag_string @tag_string else - rows = self.class.connection.select_rows( self.tags.scoped.to_sql ) - rows.inject(""){|string, row| string << "##{row[1]} " } + tags = self.tags.pluck(:name) + tags.inject(""){|string, tag| string << "##{tag} " } end end diff --git a/lib/stream/base.rb b/lib/stream/base.rb index 9a00ee173f775d924cb9b6a2186546b40924bf07..77bbbe66a086d417f551214afe77120b74de13ac 100644 --- a/lib/stream/base.rb +++ b/lib/stream/base.rb @@ -32,7 +32,7 @@ class Stream::Base # @return [ActiveRecord::Relation<Post>] def posts - Post.scoped + Post.all end # @return [Array<Post>]