From 65a9d2f88dbd24a224e62f0464605e948df1667f Mon Sep 17 00:00:00 2001
From: Clarissa <cdp13@inf.ufpr.br>
Date: Tue, 9 May 2017 10:34:34 -0300
Subject: [PATCH] #241: fix bug - show collection of cuurent_user (index)
---
app/policies/collection_policy.rb | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/policies/collection_policy.rb b/app/policies/collection_policy.rb
index 7ca595c7..b39a280f 100644
--- a/app/policies/collection_policy.rb
+++ b/app/policies/collection_policy.rb
@@ -7,8 +7,12 @@ class CollectionPolicy < ApplicationPolicy
class Scope < Scope
def resolve
- if !user.nil? && user.is_admin?
- scope.all
+ if !user.nil?
+ if user.is_admin?
+ scope.all
+ else
+ scope.includes(:collection_items).where.not(:collection_items => {:collection_id => nil}).where("privacy = ? OR owner_id = ?", 'public', user.id)
+ end
else
scope.includes(:collection_items).where.not(:collection_items => {:collection_id => nil}).where(privacy: 'public')
end
--
GitLab