From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 14 Mar 2018 08:41:07 +0000 (+0800)
Subject: Handle current_user being both an admin and a moderator for building user list
X-Git-Tag: live~2953^2~22
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/283cffdfdbbe31f0a5e6a9dc52b35a8c93a28fb1

Handle current_user being both an admin and a moderator for building user list
---

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