From 283cffdfdbbe31f0a5e6a9dc52b35a8c93a28fb1 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 14 Mar 2018 16:41:07 +0800 Subject: [PATCH] Handle current_user being both an admin and a moderator for building user list --- app/controllers/issues_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 10b626cd1..c2470dc5b 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -11,12 +11,11 @@ class IssuesController < ApplicationController if current_user.moderator? @issue_types = %w[Note] - @users = User.joins(:roles).where(:user_roles => { :role => "moderator" }) else @issue_types = %w[DiaryEntry DiaryComment User] - @users = User.joins(:roles).where(:user_roles => { :role => "administrator" }) end + @users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct @issues = Issue.where(:assigned_role => current_user.roles.map(&:role)) # If search -- 2.43.2