From 7a90003dccf5e598a58c614f35e17318c43a49fb Mon Sep 17 00:00:00 2001
From: Mateus Rambo Strey <mars11@inf.ufpr.br>
Date: Thu, 31 Mar 2016 09:15:15 -0300
Subject: [PATCH] fix delete learning objects from collections
---
app/controllers/collections_controller.rb | 8 ++++++--
app/policies/collection_policy.rb | 4 ----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index 34fb0690..a3395e87 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 06180e1c..6ebfa00e 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
--
GitLab