X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3cf5667c919813e2fd5a71254ff56bf1ebdba793..ca719af262380a906103e7aec9befb4c903693a1:/app/controllers/issues_controller.rb?ds=inline diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index f53a8dad5..5cedb3c70 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -18,8 +18,8 @@ class IssuesController < ApplicationController @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) @@ -27,12 +27,11 @@ class IssuesController < ApplicationController # If search if params[:search_by_user].present? @find_user = User.find_by(:display_name => params[:search_by_user]) - if @find_user - @issues = @issues.where(:reported_user => @find_user) - else - @issues = @issues.none - flash.now[:warning] = t(".user_not_found") - end + @issues = if @find_user + @issues.where(:reported_user => @find_user) + else + @issues.none + end end @issues = @issues.where(:status => params[:status]) if params[:status].present? @@ -49,7 +48,7 @@ class IssuesController < ApplicationController end def show - @title = t ".title", :status => @issue.status.humanize, :issue_id => @issue.id + @title = t ".title.#{@issue.status}", :issue_id => @issue.id @read_reports = @issue.read_reports @unread_reports = @issue.unread_reports @comments = @issue.comments