From 85bf9adb91df1944560d5a81a21fec4201d8d722 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 14 Mar 2018 16:45:57 +0800 Subject: [PATCH] Handle issue_types properly if current_user is both and admin and a moderator --- app/controllers/issues_controller.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index c2470dc5b..6f4667a30 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -9,11 +9,9 @@ class IssuesController < ApplicationController def index @title = t ".title" - if current_user.moderator? - @issue_types = %w[Note] - else - @issue_types = %w[DiaryEntry DiaryComment User] - end + @issue_types = [] + @issue_types.concat %w[Note] if current_user.moderator? + @issue_types.concat %w[DiaryEntry DiaryComment User] if current_user.administrator? @users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct @issues = Issue.where(:assigned_role => current_user.roles.map(&:role)) -- 2.43.2