Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/5381'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Dec 5, 2024
2 parents 2cb1462 + 1c3e474 commit 08de53f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/controllers/issues_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ def index
@title = t ".title"

@issue_types = []
@issue_types.push("Note", "User") if current_user.moderator?
@issue_types.push("DiaryEntry", "DiaryComment", "User") if current_user.administrator?
@issue_types |= %w[Note User] if current_user.moderator?
@issue_types |= %w[DiaryEntry DiaryComment User] if current_user.administrator?

@users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct
@issues = Issue.visible_to(current_user)
Expand Down

0 comments on commit 08de53f

Please sign in to comment.