X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cba08bb454a0e3571cfc3e858dc2b2817e7b7538..0366c2eabb065f08312f494a58c29d0ed575759d:/app/controllers/issues_controller.rb diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index b46794d72..e79a03203 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -8,6 +8,8 @@ class IssuesController < ApplicationController before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore] def index + @title = t ".title" + if current_user.moderator? @issue_types = @moderator_issues @users = User.joins(:roles).where(:user_roles => { :role => "moderator" }) @@ -24,29 +26,23 @@ class IssuesController < ApplicationController if @find_user @issues = @issues.where(:reported_user_id => @find_user.id) else - notice = t("issues.index.search.user_not_found") + notice = t("issues.index.user_not_found") end end if params[:status] && params[:status][0].present? - @issues = @issues.where(:status => params[:status][0].to_i) + @issues = @issues.where(:status => params[:status][0]) end if params[:issue_type] && params[:issue_type][0].present? @issues = @issues.where(:reportable_type => params[:issue_type][0]) end - # If last_updated_by if params[:last_updated_by] && params[:last_updated_by][0].present? last_updated_by = params[:last_updated_by][0].to_s == "nil" ? nil : params[:last_updated_by][0].to_i @issues = @issues.where(:updated_by => last_updated_by) end - if params[:last_reported_by] && params[:last_reported_by][0].present? - last_reported_by = params[:last_reported_by][0].to_s == "nil" ? nil : params[:last_reported_by][0].to_i - @issues = @issues.where(:updated_by => last_reported_by) - end - redirect_to issues_path, :notice => notice if notice end