X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c7bc13668b78afde72e9b8f6644b001799e84eb9..3276063fcfba982b7bbb886f5ef18d7ae67c46f5:/app/controllers/issues_controller.rb?ds=sidebyside diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 4f88dce84..edf8f1121 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -3,109 +3,101 @@ class IssuesController < ApplicationController before_action :authorize_web before_action :require_user - before_action :check_permission, only: [:index, :show, :resolve,:open,:ignore,:comment] - before_action :find_issue, only: [:show, :resolve, :reopen, :ignore] + before_action :set_issues + before_action :check_permission, :only => [:index, :show, :resolve, :open, :ignore, :comment] + before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore] + before_action :setup_user_role, :only => [:show, :index] def index - @issues = Issue.all.order(:status) - end - - def show - @read_reports = @issue.read_reports - @unread_reports = @issue.unread_reports - @comments = @issue.comments - @related_issues = @issue.user.issues - end - - def new - unless create_new_issue_params.blank? - @issue = Issue.find_or_initialize_by(create_new_issue_params) + if current_user.moderator? + @issue_types = @moderator_issues + @users = User.joins(:roles).where(:user_roles => { :role => "moderator" }) + else + @issue_types = @admin_issues + @users = User.joins(:roles).where(:user_roles => { :role => "administrator" }) end - end - def create - @issue = Issue.find_by_reportable_id_and_reportable_type(params[:reportable_id],params[:reportable_type]) + @issues = Issue.where(:issue_type => @user_role) - # Check if Issue alrwady exists - if !@issue - @issue = Issue.find_or_initialize_by(issue_params) - @admins = UserRole.where(role: "administrator") - @admins.each do |admin| - Notifier.new_issue_notification(User.find(admin.user_id)).deliver_now + # If search + if params[:search_by_user] && 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) + else + notice = t("issues.index.search.user_not_found") end end - # Check if details provided are sufficient - if params[:report][:details] and (params[:spam] or params[:offensive] or params[:threat] or params[:vandal] or params[:other]) - @report = @issue.reports.build(report_params) - details = params[:report][:details].to_s + "||" + params[:spam].to_s + "||" + params[:offensive].to_s + "||" + params[:threat].to_s + "||" + params[:vandal].to_s + "||" + params[:other].to_s - @report.reporter_user_id = @user.id - @report.details = details + if params[:status] && params[:status][0].present? + @issues = @issues.where(:status => params[:status][0].to_i) + end - # Checking if instance has been updated since last report - @last_report = @issue.reports.order(updated_at: :desc).last - if @issue.reportable.updated_at.present? and (@issue.ignored? or @issue.resolved?) and @issue.reportable.updated_at > @last_report.updated_at - if @issue.reopen - @issue.save! - end - end + if params[:issue_type] && params[:issue_type][0].present? + @issues = @issues.where(:reportable_type => params[:issue_type][0]) + end - if @issue.save! - redirect_to root_path, 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') + # 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 + + def show + @read_reports = @issue.read_reports + @unread_reports = @issue.unread_reports + @comments = @issue.comments + @related_issues = @issue.reported_user.issues.where(:issue_type => @user_role) + @new_comment = IssueComment.new(:issue => @issue) end def update @issue = Issue.find_by(issue_params) - # Check if details provided are sufficient - if params[:report][:details] and (params[:spam] or params[:offensive] or params[:threat] or params[:vandal] or params[:other]) - @report = @issue.reports.where(reporter_user_id: @user.id).first - - if @report == nil + if check_report_params + @report = @issue.reports.where(:reporter_user_id => current_user.id).first + + if @report.nil? @report = @issue.reports.build(report_params) - @report.reporter_user_id = @user.id - notice = t('issues.update.new_report') + @report.reporter_user_id = current_user.id + notice = t("issues.update.new_report") end - details = params[:report][:details].to_s + "||" + params[:spam].to_s + "||" + params[:offensive].to_s + "||" + params[:threat].to_s + "||" + params[:vandal].to_s + "||" + params[:other].to_s - @report.details = details + 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 @issue.reportable.updated_at.present? and (@issue.ignored? or @issue.resolved?) and @issue.reportable.updated_at > @last_report.updated_at + # 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 - if notice == nil - notice = t('issues.update.successful_update') - end + notice = t("issues.update.successful_update") if notice.nil? if @report.save! - redirect_to root_path, notice: notice + @issue.report_count = @issue.reports.count + @issue.save! + redirect_back :fallback_location => "/", :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]) - @issue_comment = @issue.comments.build(issue_comment_params) - @issue_comment.commenter_user_id = @user.id - @issue_comment.save! - redirect_to @issue + redirect_to new_issue_path(:reportable_type => @issue.reportable_type, :reportable_id => @issue.reportable_id), :notice => t("issues.update.provide_details") + end end # Status Transistions def resolve if @issue.resolve @issue.save! - redirect_to @issue, notice: t('issues.resolved') + redirect_to @issue, :notice => t("issues.resolved") else render :show end @@ -113,8 +105,9 @@ class IssuesController < ApplicationController def ignore if @issue.ignore + @issue.updated_by = current_user.id @issue.save! - redirect_to @issue, notice: t('issues.ignored') + redirect_to @issue, :notice => t("issues.ignored") else render :show end @@ -122,39 +115,84 @@ class IssuesController < ApplicationController def reopen if @issue.reopen + @issue.updated_by = current_user.id @issue.save! - redirect_to @issue, notice: t('issues.reopened') + redirect_to @issue, :notice => t("issues.reopened") else render :show end end + # Reassign Issues between Administrators and Moderators + def reassign_issue + @issue.issue_type = upgrade_issue(@issue.issue_type) + @issue.save! + end + private - def find_issue - @issue = Issue.find(params[:id]) + def upgrade_issue(type) + if type == "moderator" + "administrator" + else + "moderator" end + end - def check_permission - unless @user.administrator? - flash[:error] = t("application.require_admin.not_an_admin") - redirect_to root_path - end - end + def set_issues + @admin_issues = %w[DiaryEntry DiaryComment User] + @moderator_issues = %w[Changeset Note] + end - def create_new_issue_params - params.permit(:reportable_id, :reportable_type, :reported_user_id) - end + def setup_user_role + # Get user role + @user_role = current_user.administrator? ? "administrator" : "moderator" + end - def issue_params - params[:issue].permit(:reportable_id, :reportable_type,:reported_user_id) + 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 + else + false end + end - def report_params - params[:report].permit(:details) - end + def report_details + params[:report][:details] + "--||--" + params[:report_type].to_s + "--||--" + end - def issue_comment_params - params.require(:issue_comment).permit(:body) + 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 current_user.administrator? || current_user.moderator? + flash[:error] = t("application.require_admin.not_an_admin") + redirect_to root_path end + end + + def issue_params + params[:issue].permit(:reportable_id, :reportable_type) + end + + def report_params + params[:report].permit(:details) + end + + def issue_comment_params + params.require(:issue_comment).permit(:body) + end + + def sort_column + Issue.column_names.include?(params[:sort]) ? params[:sort] : "status" + end + + def sort_direction + %w[asc desc].include?(params[:direction]) ? params[:direction] : "asc" + end end