Handle issue_types properly if current_user is both and admin and a moderator
authorAndy Allan <git@gravitystorm.co.uk>
Wed, 14 Mar 2018 08:45:57 +0000 (16:45 +0800)
committerAndy Allan <git@gravitystorm.co.uk>
Wed, 14 Mar 2018 08:47:45 +0000 (16:47 +0800)
app/controllers/issues_controller.rb

index c2470dc..6f4667a 100644 (file)
@@ -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))