diff --git a/app/models/ability.rb b/app/models/ability.rb index 0ebabfdc..b41b777d 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -87,7 +87,7 @@ class Ability event.program.cfp_open? && event.new_record? end - can [:update, :show, :delete, :index], Event do |event| + can [:update, :show, :index], Event do |event| event.users.include?(user) end diff --git a/app/models/admin_ability.rb b/app/models/admin_ability.rb index 716aecb0..6bd74862 100644 --- a/app/models/admin_ability.rb +++ b/app/models/admin_ability.rb @@ -39,7 +39,7 @@ class AdminAbility event.program.cfp_open? && event.new_record? end - can [:update, :show, :delete, :index], Event do |event| + can [:update, :show, :index], Event do |event| event.users.include?(user) end diff --git a/spec/models/ability_spec.rb b/spec/models/ability_spec.rb index 2144cec6..1da13c5b 100644 --- a/spec/models/ability_spec.rb +++ b/spec/models/ability_spec.rb @@ -101,7 +101,6 @@ describe 'User' do it{ should be_able_to(:update, user_event_with_cfp) } it{ should be_able_to(:show, user_event_with_cfp) } - it{ should be_able_to(:delete, user_event_with_cfp) } it{ should_not be_able_to(:new, Event.new(program: program_without_cfp)) } it{ should_not be_able_to(:create, Event.new(program: program_without_cfp)) } # TODO: At moment it's not possible to manually add someone else as event_user