diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb index 34fb069056991b3218a95e186444c1cb0c3d034c..a3395e877842fb6267df36a0792546603be9f746 100644 --- a/app/controllers/collections_controller.rb +++ b/app/controllers/collections_controller.rb @@ -209,8 +209,12 @@ class CollectionsController < ApplicationController end def authorize_action - @collection ||= Collection.new - authorize @collection + if !@collections.nil? + @collections.each { |c| authorize c } + else + @collection ||= Collection.new + authorize @collection + end end end diff --git a/app/policies/collection_policy.rb b/app/policies/collection_policy.rb index 06180e1cc928c266a6cff4fe237d3763780081f4..6ebfa00e167492205bb49989e9c5611056c46e8c 100644 --- a/app/policies/collection_policy.rb +++ b/app/policies/collection_policy.rb @@ -3,8 +3,6 @@ class CollectionPolicy < ApplicationPolicy include FollowablePolicy class Scope < Scope - - def initialize (user, user_id, scope) @user = user @user_id = user_id @@ -12,7 +10,6 @@ class CollectionPolicy < ApplicationPolicy end def resolve - if @user.try(:id) == @user_id || @user.try(:is_admin?) scope.all else @@ -21,7 +18,6 @@ class CollectionPolicy < ApplicationPolicy end end - def create? record if user_exists? end