diff --git a/app/controllers/concerns/publisher_controller.rb b/app/controllers/concerns/publisher_controller.rb index c9c88ff2fe6642a878c3a6e166b31d8eb16af373..5199dca2fe3c0f7e14ea3425539bdaa8e35e962b 100644 --- a/app/controllers/concerns/publisher_controller.rb +++ b/app/controllers/concerns/publisher_controller.rb @@ -40,7 +40,7 @@ module PublisherController end def show_all_collections - render json: ::UserPolicy::Scope.new(current_user, @publisher, Collection).resolve + render json: ::UserPolicy::Scope.new(current_user, @publisher, Collection).resolve.where(owner: @publisher) end def show_liked_learning_objects diff --git a/app/policies/publisher_policy.rb b/app/policies/publisher_policy.rb index b64034699926300c893824e2bc90187b31ad2262..5df13047229f9888c91ba76bca2937845f97258a 100644 --- a/app/policies/publisher_policy.rb +++ b/app/policies/publisher_policy.rb @@ -31,10 +31,8 @@ module PublisherPolicy def resolve if user.nil? scope.where(privacy: 'public') - elsif user_can_edit? + elsif user_can_edit? || record == user scope.all - elsif record == user - scope.where(owner: user) else scope.where(privacy: 'public') end