cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle issue_types properly if current_user is both and admin and a moderator

Browse source
This commit is contained in:
Andy Allan 2018-03-14 16:45:57 +08:00
parent 283cffdfdb
commit 85bf9adb91
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/issues_controller.rb
View 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))