X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0a3dd82c47f5df0d55554c80a3b47f54ef6d204b..1cf4bf5d983c65ac0bb3868f0bd962b016433265:/app/controllers/issues_controller.rb diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index ed80777df..c24054f77 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -2,125 +2,60 @@ class IssuesController < ApplicationController layout "site" 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_locale + before_action :check_database_readable - def index - if params[:search_by_user].present? - @user = User.find_by_display_name(params[:search_by_user]) - if @user.present? - @issues = Issue.where(reported_user_id: @user.id).order(:status) - else - @issues = Issue.all.order(:status) - redirect_to issues_path, notice: t('issues.index.search.user_not_found') - end - - if @user.present? and not @issues.present? - @issues = Issue.all.order(:status) - redirect_to issues_path, notice: t('issues.index.search.issues_not_found') - end - else - @issues = Issue.all.order(:status) - end - end - - def show - @read_reports = @issue.read_reports - @unread_reports = @issue.unread_reports - @comments = @issue.comments - @related_issues = @issue.user.issues - end + authorize_resource - def new - unless create_new_issue_params.blank? - @issue = Issue.find_or_initialize_by(create_new_issue_params) - end - end + before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore] + before_action :check_database_writable, :only => [:resolve, :ignore, :reopen] - def create - @issue = Issue.find_by_reportable_id_and_reportable_type(params[:reportable_id],params[:reportable_type]) + def index + @title = t ".title" - # 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 - end - end + @issue_types = [] + @issue_types.push("Note", "User") if current_user.moderator? + @issue_types.push("DiaryEntry", "DiaryComment", "User") if current_user.administrator? - # 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 - - # 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 + @users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct + @issues = Issue.visible_to(current_user).order(:updated_at => :desc) - if @issue.save! - redirect_to root_path, notice: t('issues.create.successful_report') + # If search + 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 => @find_user) + else + @issues = @issues.none + flash.now[:warning] = t(".user_not_found") 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 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 - @report = @issue.reports.build(report_params) - @report.reporter_user_id = @user.id - notice = t('issues.update.new_report') - end + @issues = @issues.where(:status => params[:status]) if params[:status].present? - 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 + @issues = @issues.where(:reportable_type => params[:issue_type]) if params[:issue_type].present? - # 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 - @issue.reopen - @issue.save! - end - - if notice == nil - notice = t('issues.update.successful_update') - end - - if @report.save! - redirect_to root_path, 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 + 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 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 + def show + @title = t ".title", :status => @issue.status.humanize, :issue_id => @issue.id + @read_reports = @issue.read_reports + @unread_reports = @issue.unread_reports + @comments = @issue.comments + @related_issues = @issue.reported_user.issues.where(:assigned_role => current_user.roles.map(&:role)) if @issue.reported_user + @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('issues.resolved') + redirect_to @issue, :notice => t(".resolved") else render :show end @@ -128,8 +63,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(".ignored") else render :show end @@ -137,8 +73,9 @@ 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(".reopened") else render :show end @@ -146,30 +83,9 @@ class IssuesController < ApplicationController private - def find_issue - @issue = Issue.find(params[:id]) - end - - def check_permission - unless @user.administrator? - 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) - end - - def report_params - params[:report].permit(:details) - end - - def issue_comment_params - params.require(:issue_comment).permit(:body) - end + def find_issue + @issue = Issue.visible_to(current_user).find(params[:id]) + rescue ActiveRecord::RecordNotFound + redirect_to :controller => "errors", :action => "not_found" + end end