X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3ff8ef52b71d544e6660ea7823a43397165cd180..0254f7ee0969f976d536118198bf752029dcd494:/app/controllers/issues_controller.rb?ds=sidebyside diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 10a6dc09b..44c19e322 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -3,10 +3,12 @@ class IssuesController < ApplicationController before_action :authorize_web before_action :set_locale + before_action :check_database_readable authorize_resource before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore] + before_action :check_database_writable, :only => [:resolve, :ignore, :reopen] def index @title = t ".title" @@ -16,10 +18,10 @@ class IssuesController < ApplicationController @issue_types.push("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) + @issues = Issue.visible_to(current_user).order(:updated_at => :desc) # If search - if params[:search_by_user]&.present? + 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_id => @find_user.id) @@ -29,11 +31,11 @@ class IssuesController < ApplicationController end end - @issues = @issues.where(:status => params[:status]) if params[:status]&.present? + @issues = @issues.where(:status => params[:status]) if params[:status].present? - @issues = @issues.where(:reportable_type => params[:issue_type]) if params[:issue_type]&.present? + @issues = @issues.where(:reportable_type => params[:issue_type]) if params[:issue_type].present? - if params[:last_updated_by]&.present? + if params[:last_updated_by].present? last_updated_by = params[:last_updated_by].to_s == "nil" ? nil : params[:last_updated_by].to_i @issues = @issues.where(:updated_by => last_updated_by) end