From decf0f2683357c9221e230796934bc65c4addafd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Mon, 14 Mar 2016 14:35:57 +0100 Subject: [PATCH] changes admin/valuator permissions not allowed to create/destroy spending proposals anymore --- app/models/abilities/administrator.rb | 2 +- app/models/abilities/valuator.rb | 2 +- spec/models/abilities/administrator_spec.rb | 4 +++- spec/models/abilities/valuator_spec.rb | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/models/abilities/administrator.rb b/app/models/abilities/administrator.rb index 49184c447..78cb60806 100644 --- a/app/models/abilities/administrator.rb +++ b/app/models/abilities/administrator.rb @@ -37,7 +37,7 @@ module Abilities can :manage, Annotation - can :manage, SpendingProposal + can [:read, :update], SpendingProposal end end end diff --git a/app/models/abilities/valuator.rb b/app/models/abilities/valuator.rb index edb542e4b..15add866a 100644 --- a/app/models/abilities/valuator.rb +++ b/app/models/abilities/valuator.rb @@ -3,7 +3,7 @@ module Abilities include CanCan::Ability def initialize(user) - can :manage, SpendingProposal + can [:read, :update, :valuate], SpendingProposal end end end \ No newline at end of file diff --git a/spec/models/abilities/administrator_spec.rb b/spec/models/abilities/administrator_spec.rb index 8df88a46f..b5ee78dd0 100644 --- a/spec/models/abilities/administrator_spec.rb +++ b/spec/models/abilities/administrator_spec.rb @@ -52,5 +52,7 @@ describe "Abilities::Administrator" do it { should be_able_to(:manage, Annotation) } - it { should be_able_to(:manage, SpendingProposal) } + it { should be_able_to(:read, SpendingProposal) } + it { should be_able_to(:update, SpendingProposal) } + it { should be_able_to(:valuate, SpendingProposal) } end diff --git a/spec/models/abilities/valuator_spec.rb b/spec/models/abilities/valuator_spec.rb index d9542220d..ce108200c 100644 --- a/spec/models/abilities/valuator_spec.rb +++ b/spec/models/abilities/valuator_spec.rb @@ -6,5 +6,7 @@ describe "Abilities::Valuator" do let(:user) { valuator.user } let(:valuator) { create(:valuator) } - it { should be_able_to(:manage, SpendingProposal) } + it { should be_able_to(:read, SpendingProposal) } + it { should be_able_to(:update, SpendingProposal) } + it { should be_able_to(:valuate, SpendingProposal) } end