X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e74163d036a0520de62667b2e77ffbe66bc7c72d..fb953006a1a8fe2949f376e167dda963dfd784bd:/app/controllers/issues_controller.rb diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index dc357a6ae..61f466f62 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -2,39 +2,40 @@ 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 + + authorize_resource + + before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore] def index - # Get user role - if @user.administrator? - @user_role = "administrator" - else - @user_role = "moderator" - end + @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? + + @users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct + @issues = Issue.visible_to(current_user) # If search - if params[:search_by_user] - @find_user = User.find_by_display_name(params[:search_by_user]) + if params[:search_by_user]&.present? + @find_user = User.find_by(:display_name => params[:search_by_user]) if @find_user - @issues = Issue.where(reported_user_id: @find_user.id, issue_type: @user_role).order(:status) - else - @issues = Issue.where(issue_type: @user_role).order(:status) - notice = t('issues.index.search.user_not_found') + @issues = @issues.where(:reported_user_id => @find_user.id) + else + @issues = @issues.none + flash.now[:warning] = t(".user_not_found") end + end - if @find_user !=nil and @issues.first == nil - @issues = Issue.where(issue_type: @user_role).order(:status) - notice = t('issues.index.search.issues_not_found') - end + @issues = @issues.where(:status => params[:status]) if params[:status]&.present? - if notice - redirect_to issues_path, notice: notice - end - - else - @issues = Issue.where(issue_type: @user_role).order(:status) + @issues = @issues.where(:reportable_type => params[:issue_type]) if params[:issue_type]&.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 end @@ -42,120 +43,15 @@ class IssuesController < ApplicationController @read_reports = @issue.read_reports @unread_reports = @issue.unread_reports @comments = @issue.comments - @related_issues = @issue.user.issues - if @issue.updated_by - @updated_by_admin = User.find(@issue.updated_by) - end - end - - def new - unless create_new_issue_params.blank? - @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 - - # TODO: Find better place to add these - admin_issues = [ 'DiaryEntry', 'DiaryComment', 'User'] - moderator_issues = [] - - - @issue = Issue.find_by_reportable_id_and_reportable_type(params[:reportable_id],params[:reportable_type]) - # Check if Issue alrwady exists - if !@issue - @issue = Issue.find_or_initialize_by(issue_params) - @issue.updated_by = nil - @admins = UserRole.where(role: "administrator") - @admins.each do |admin| - Notifier.new_issue_notification(User.find(admin.user_id)).deliver_now - end - - # Reassign to moderators if it is a moderator issue - @issue.issue_type = "administrator" - if moderator_issues.include? @issue.reportable.class.name - reassign_issue - end - end - - # Check if details provided are sufficient - if check_report_params - @report = @issue.reports.build(report_params) - details = get_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 - if @issue.reopen - @issue.save! - end - 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') - 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 = get_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 - - 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 - end - - def comment - @issue = Issue.find(params[:id]) - @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! - redirect_to @issue + @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 def resolve if @issue.resolve @issue.save! - redirect_to @issue, notice: t('issues.resolved') + redirect_to @issue, :notice => t(".resolved") else render :show end @@ -163,9 +59,9 @@ 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') + redirect_to @issue, :notice => t(".ignored") else render :show end @@ -173,72 +69,17 @@ 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') + redirect_to @issue, :notice => t(".reopened") else render :show end end - # Reassign Issues between Administrators and Moderators - def reassign_issue - if @issue.issue_type == "moderator" - @issue.issue_type = "administrator" - else - @issue.issue_type = "moderator" - end - @issue.save! - end - private - def check_if_updated - if @issue.reportable and (@issue.ignored? or @issue.resolved?) and @issue.reportable.updated_at > @last_report.updated_at - return true - else - return false - end - end - - def get_report_details - details = params[:report][:details] + "--||--" - details = details + params[:report_type].to_s + "--||--" - return details - end - - def check_report_params - if params[:report] and params[:report][:details] and params[:report_type] - return true - end - return false - end - - 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.find(params[:id]) + end end