X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b9988bdbc859fea2b1822c8ce594b39ca33da70e..68481fe7753432ffd3051ede15f7518b1c0d73c9:/app/controllers/issues_controller.rb diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index f53a8dad5..298f7c374 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? @@ -45,11 +44,20 @@ class IssuesController < ApplicationController end @issues, @newer_issues_id, @older_issues_id = get_page_items(@issues, :limit => @params[:limit]) + + @unique_reporters = @issues.each_with_object({}) do |issue, reporters| + user_ids = issue.reports.order(:created_at => :desc).pluck(:user_id).uniq + reporters[issue.id] = { + :count => user_ids.size, + :users => User.in_order_of(:id, user_ids.first(3)) + } + end + render :partial => "page" if turbo_frame_request_id == "pagination" 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