Merge remote-tracking branch 'upstream/pull/5381'
This commit is contained in:
commit
08de53f51b
1 changed files with 2 additions and 2 deletions
|
@ -18,8 +18,8 @@ class IssuesController < ApplicationController
|
||||||
@title = t ".title"
|
@title = t ".title"
|
||||||
|
|
||||||
@issue_types = []
|
@issue_types = []
|
||||||
@issue_types.push("Note", "User") if current_user.moderator?
|
@issue_types |= %w[Note User] if current_user.moderator?
|
||||||
@issue_types.push("DiaryEntry", "DiaryComment", "User") if current_user.administrator?
|
@issue_types |= %w[DiaryEntry DiaryComment User] if current_user.administrator?
|
||||||
|
|
||||||
@users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct
|
@users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct
|
||||||
@issues = Issue.visible_to(current_user)
|
@issues = Issue.visible_to(current_user)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue