X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3e4255eb2cc9f8b260ecab6d80c783723cf89d88..8dc8479e12b50878ca6b476a4dd72fe1da1f24ad:/app/controllers/issues_controller.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 346755fe3..3f28ec44f 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -8,8 +8,6 @@ class IssuesController < ApplicationController
   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 current_user.moderator?
       @issue_types = @moderator_issues
@@ -19,7 +17,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 => @user_role)
 
     # If search
     if params[:search_by_user] && params[:search_by_user].present?
@@ -45,8 +43,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,55 +55,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)
-  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 = current_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 :fallback_location => "/", :notice => t("issues.create.successful_report")
-      end
-    else
-      redirect_to new_issue_path(:reportable_type => @issue.reportable_type, :reportable_id => @issue.reportable_id), :notice => t("issues.create.provide_details")
-    end
+    @related_issues = @issue.reported_user.issues.where(:assigned_role => @user_role)
+    @new_comment = IssueComment.new(:issue => @issue)
   end
 
   def update
@@ -144,25 +93,6 @@ class IssuesController < ApplicationController
     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 = current_user.id
-      if params[:reassign]
-        reassign_issue
-        @issue_comment.reassign = true
-      end
-      @issue_comment.save!
-      @issue.updated_by = current_user.id
-      @issue.save!
-      notice = t("issues.comment.comment_created")
-    end
-    redirect_to @issue, :notice => notice
-  end
-
   # Status Transistions
   def resolve
     if @issue.resolve
@@ -193,22 +123,8 @@ 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]
@@ -246,10 +162,6 @@ class IssuesController < ApplicationController
     end
   end
 
-  def create_new_issue_params
-    params.permit(:reportable_id, :reportable_type)
-  end
-
   def issue_params
     params[:issue].permit(:reportable_id, :reportable_type)
   end