Reopen issues if necessary when creating a report.

[rails.git] / app / controllers / issues_controller.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 534cc2fde31e0f45b4430f88d1c13f527087a09e..b46794d72d86a9b1e44488f8d2138b3e5cc21cb8 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -4,11 +4,8 @@ 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 current_user.moderator?
@@ -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?
@@ -57,60 +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)
-  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 => current_user.id).first
-
-      if @report.nil?
-        @report = @issue.reports.build(report_params)
-        @report.reporter_user_id = current_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 :fallback_location => "/", :notice => notice
-      end
-    else
-      redirect_to new_issue_path(:reportable_type => @issue.reportable_type, :reportable_id => @issue.reportable_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 = 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
+    @related_issues = @issue.reported_user.issues.where(:assigned_role => current_user.roles.map(&:role))
+    @new_comment = IssueComment.new(:issue => @issue)
   end
 
   # Status Transistions
@@ -143,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 = current_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
@@ -177,14 +103,6 @@ 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