X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/65e1dbb4a69cf5251c638e50e480aee3b77bca50..3a386f185c954d71a9b5d0747d017f99c8ccb6ff:/app/controllers/issues_controller.rb?ds=sidebyside diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index ffce14774..b46794d72 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -4,14 +4,11 @@ class IssuesController < ApplicationController before_action :authorize_web before_action :require_user before_action :set_issues - before_action :check_permission, :only => [:index, :show, :resolve, :open, :ignore, :comment] + before_action :check_permission before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore] - before_action :setup_user_role, :only => [:show, :index] - - helper_method :sort_column, :sort_direction def index - if @user.moderator? + if current_user.moderator? @issue_types = @moderator_issues @users = User.joins(:roles).where(:user_roles => { :role => "moderator" }) else @@ -19,7 +16,7 @@ class IssuesController < ApplicationController @users = User.joins(:roles).where(:user_roles => { :role => "administrator" }) end - @issues = Issue.where(:issue_type => @user_role).order(sort_column + " " + sort_direction) + @issues = Issue.where(:assigned_role => current_user.roles.map(&:role)) # If search if params[:search_by_user] && params[:search_by_user].present? @@ -45,8 +42,6 @@ class IssuesController < ApplicationController @issues = @issues.where(:updated_by => last_updated_by) end - notice = t("issues.index.search.issues_not_found") if @issues.first.nil? - 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) @@ -59,110 +54,8 @@ class IssuesController < ApplicationController @read_reports = @issue.read_reports @unread_reports = @issue.unread_reports @comments = @issue.comments - @related_issues = @issue.reported_user.issues.where(:issue_type => @user_role) - - @updated_by_admin = User.find(@issue.updated_by) if @issue.updated_by - end - - def new - if create_new_issue_params.present? - @issue = Issue.find_or_initialize_by(create_new_issue_params) - path = "issues.report_strings." + @issue.reportable.class.name.to_s - @report_strings_yaml = t(path) - end - end - - def create - @issue = Issue.find_by(:reportable_id => params[:reportable_id], :reportable_type => params[:reportable_type]) - # Check if Issue already exists - unless @issue - @issue = Issue.find_or_initialize_by(issue_params) - @issue.updated_by = nil - - # Reassign to moderators if it is a moderator issue - @issue.issue_type = "administrator" - reassign_issue if @moderator_issues.include? @issue.reportable.class.name - end - - # Check if details provided are sufficient - if check_report_params - @report = @issue.reports.build(report_params) - details = report_details - @report.reporter_user_id = @user.id - @report.details = details - # Checking if instance has been updated since last report - @last_report = @issue.reports.order(:updated_at => :desc).last - if check_if_updated - @issue.save! if @issue.reopen - end - - if @issue.save! - @issue.report_count = @issue.reports.count - @issue.save! - - @admins_or_mods = UserRole.where(:role => @issue.issue_type) - @admins_or_mods.each do |user| - Notifier.new_issue_notification(@issue.id, User.find(user.user_id)).deliver_now - end - - redirect_back "/", :notice => t("issues.create.successful_report") - end - else - redirect_to new_issue_path(:reportable_type => @issue.reportable_type, :reportable_id => @issue.reportable_id, :reported_user_id => @issue.reported_user_id), :notice => t("issues.create.provide_details") - end - end - - def update - @issue = Issue.find_by(issue_params) - # Check if details provided are sufficient - if check_report_params - @report = @issue.reports.where(:reporter_user_id => @user.id).first - - if @report.nil? - @report = @issue.reports.build(report_params) - @report.reporter_user_id = @user.id - notice = t("issues.update.new_report") - end - - details = report_details - @report.details = details - - # Checking if instance has been updated since last report - @last_report = @issue.reports.order(:updated_at => :desc).last - if check_if_updated - @issue.reopen - @issue.save! - end - - notice = t("issues.update.successful_update") if notice.nil? - - if @report.save! - @issue.report_count = @issue.reports.count - @issue.save! - redirect_back "/", :notice => notice - end - else - redirect_to new_issue_path(:reportable_type => @issue.reportable_type, :reportable_id => @issue.reportable_id, :reported_user_id => @issue.reported_user_id), :notice => t("issues.update.provide_details") - end - end - - def comment - @issue = Issue.find(params[:id]) - if issue_comment_params.blank? - notice = t("issues.comment.provide_details") - else - @issue_comment = @issue.comments.build(issue_comment_params) - @issue_comment.commenter_user_id = @user.id - if params[:reassign] - reassign_issue - @issue_comment.reassign = true - end - @issue_comment.save! - @issue.updated_by = @user.id - @issue.save! - notice = t("issues.comment.comment_created") - end - redirect_to @issue, :notice => notice + @related_issues = @issue.reported_user.issues.where(:assigned_role => current_user.roles.map(&:role)) + @new_comment = IssueComment.new(:issue => @issue) end # Status Transistions @@ -177,7 +70,7 @@ class IssuesController < ApplicationController def ignore if @issue.ignore - @issue.updated_by = @user.id + @issue.updated_by = current_user.id @issue.save! redirect_to @issue, :notice => t("issues.ignored") else @@ -187,7 +80,7 @@ class IssuesController < ApplicationController def reopen if @issue.reopen - @issue.updated_by = @user.id + @issue.updated_by = current_user.id @issue.save! redirect_to @issue, :notice => t("issues.reopened") else @@ -195,32 +88,13 @@ class IssuesController < ApplicationController end end - # Reassign Issues between Administrators and Moderators - def reassign_issue - @issue.issue_type = upgrade_issue(@issue.issue_type) - @issue.save! - end - private - def upgrade_issue(type) - if type == "moderator" - "administrator" - else - "moderator" - end - end - def set_issues @admin_issues = %w[DiaryEntry DiaryComment User] @moderator_issues = %w[Changeset Note] end - def setup_user_role - # Get user role - @user_role = @user.administrator? ? "administrator" : "moderator" - end - def check_if_updated if @issue.reportable && (@issue.ignored? || @issue.resolved?) && @issue.reportable.has_attribute?(:updated_by) && @issue.reportable.updated_at > @last_report.updated_at true @@ -229,31 +103,19 @@ class IssuesController < ApplicationController end end - def report_details - params[:report][:details] + "--||--" + params[:report_type].to_s + "--||--" - end - - def check_report_params - params[:report] && params[:report][:details] && params[:report_type] - end - def find_issue @issue = Issue.find(params[:id]) end def check_permission - unless @user.administrator? || @user.moderator? + unless current_user.administrator? || current_user.moderator? flash[:error] = t("application.require_admin.not_an_admin") redirect_to root_path end end - def create_new_issue_params - params.permit(:reportable_id, :reportable_type, :reported_user_id) - end - def issue_params - params[:issue].permit(:reportable_id, :reportable_type, :reported_user_id) + params[:issue].permit(:reportable_id, :reportable_type) end def report_params @@ -271,13 +133,4 @@ class IssuesController < ApplicationController def sort_direction %w[asc desc].include?(params[:direction]) ? params[:direction] : "asc" end - - # back-port of ActionController#redirect_back from rails 5 - def redirect_back(fallback_location, **args) - if referer = request.headers["Referer"] - redirect_to referer, **args - else - redirect_to fallback_location, **args - end - end end