diff --git a/app/models/user.rb b/app/models/user.rb index 118478ace3764784bf52ac8c3fa63582ef5a4457..1c00819a2463753df4127fa825de1ee81d460cf0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -108,6 +108,13 @@ class User < ApplicationRecord false end + def is_curator? + roles.each do |role| + return true if role.name == 'curator' + end + false + end + def is_supervisor? roles.each do |role| return true if role.name == 'supervisor' diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb index 0f3514857c8564be46b78e0a9952d97a271d5850..dddccc940698ac9bcdd1169be4371df838eaba4a 100644 --- a/app/policies/application_policy.rb +++ b/app/policies/application_policy.rb @@ -59,8 +59,8 @@ class ApplicationPolicy user.is_admin? || user.is_editor? end - def user_can_moderate? - user.is_moderator? + def user_can_curate? + user.is_curator? end class Scope < ApplicationPolicy diff --git a/app/policies/learning_object_policy.rb b/app/policies/learning_object_policy.rb index 8e21776219caeffd56fd37f21c32981dd0089bbe..2bceb6b75ca1c61390d3413fa722264889049741 100644 --- a/app/policies/learning_object_policy.rb +++ b/app/policies/learning_object_policy.rb @@ -27,7 +27,7 @@ class LearningObjectPolicy < ApplicationPolicy end def publish? - record if user_can_moderate? && record.submitted? + record if user_can_curate? && record.submitted? end def destroy? diff --git a/app/policies/submission_policy.rb b/app/policies/submission_policy.rb index 345ec5e5f610d7c5fe360bac19e1b5f88a61ca67..c4c03d41abc73fce0ef1d59544cf0de7cad572a9 100644 --- a/app/policies/submission_policy.rb +++ b/app/policies/submission_policy.rb @@ -6,12 +6,12 @@ module SubmissionPolicy def submissions? return false if user.nil? - record if user_can_moderate? + record if user_can_curate? end def show_submission? return false if user.nil? - record if user_can_moderate? + record if user_can_curate? end end diff --git a/spec/acceptance/learning_objects_spec.rb b/spec/acceptance/learning_objects_spec.rb index fc2de13f7fd61021f80192fece9be8d7289a57c8..126991dff77da2391423173fba221a5f3ba76e7e 100644 --- a/spec/acceptance/learning_objects_spec.rb +++ b/spec/acceptance/learning_objects_spec.rb @@ -159,7 +159,7 @@ resource 'Learning Objects' do end post '/v1/learning_objects/:id/publish' do - include_context "authenticate_user_moderator" + include_context "authenticate_user_curator" let(:id) { @learning_object.id }