X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/783b5e3729228908d7404ae7404af1023501a906..7a85ce0c12cf4d75561c35e2ff28e718a390d622:/app/controllers/issues_controller.rb?ds=inline diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 61f466f62..124b29eff 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -3,20 +3,22 @@ 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" @issue_types = [] - @issue_types.concat %w[Note] if current_user.moderator? - @issue_types.concat %w[DiaryEntry DiaryComment User] if current_user.administrator? + @issue_types.push("Note") if current_user.moderator? + @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? @@ -47,9 +49,10 @@ class IssuesController < ApplicationController @new_comment = IssueComment.new(:issue => @issue) end - # Status Transistions + # Status Transitions def resolve if @issue.resolve + @issue.updated_by = current_user.id @issue.save! redirect_to @issue, :notice => t(".resolved") else @@ -80,6 +83,8 @@ class IssuesController < ApplicationController private def find_issue - @issue = Issue.find(params[:id]) + @issue = Issue.visible_to(current_user).find(params[:id]) + rescue ActiveRecord::RecordNotFound + redirect_to :controller => "errors", :action => "not_found" end end