gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not use unless with else

Browse source 
Solve Rubocop offense introduced in https://github.com/openSUSE/osem/pull/1123
This commit is contained in:
Ana 2016-08-08 23:57:03 +02:00
parent 859b3beda6
commit c1334e59cc
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/admin/questions_controller.rb
View file

@ -67,8 +67,9 @@ module Admin
def destroy def destroy
if can? :destroy, @question if can? :destroy, @question
# Do not delete global questions # Do not delete global questions
unless @question.global if @question.global
flash[:error] = 'You cannot delete global questions.'
else
# Delete question and its answers # Delete question and its answers
begin begin
Question.transaction do Question.transaction do
@ -82,8 +83,6 @@ module Admin
rescue ActiveRecord::RecordInvalid rescue ActiveRecord::RecordInvalid
flash[:error] = 'Could not delete question.' flash[:error] = 'Could not delete question.'
end end
else
flash[:error] = 'You cannot delete global questions.'
end end
else else
flash[:error] = 'You must be an admin to delete a question.' flash[:error] = 'You must be an admin to delete a question.'