Made rubocop happy by formatting and minor syntax tweaks.

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index a00423a51680d8a9c4e0f56402abc009311a686b..d31326a7db881196517bebeb7fdbcd6532e69b4b 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -3,57 +3,174 @@ class IssuesController < ApplicationController
 
   before_action :authorize_web
   before_action :require_user
 
   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]
+
+  helper_method :sort_column, :sort_direction

 
   def index
 
   def index

-    @issues = Issue.all
+    if @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
+
+    @issues = Issue.where(:issue_type => @user_role).order(sort_column + " " + sort_direction)
+
+    # If search
+    if params[:search_by_user] && !params[:search_by_user].blank?
+      @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
+
+    if params[:status] && !params[:status][0].blank?
+      @issues = @issues.where(:status => params[:status][0].to_i)
+    end
+
+    if params[:issue_type] && !params[:issue_type][0].blank?
+      @issues = @issues.where(:reportable_type => params[:issue_type][0])
+    end
+
+    # If last_updated_by
+    if params[:last_updated_by] && !params[:last_updated_by][0].blank?
+      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
+
+    notice = t("issues.index.search.issues_not_found") if @issues.first.nil?
+
+    if params[:last_reported_by] && !params[:last_reported_by][0].blank?
+      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
   end
 
   def show
     @read_reports = @issue.read_reports
     @unread_reports = @issue.unread_reports
     @comments = @issue.comments

+    @related_issues = @issue.user.issues.where(:issue_type => @user_role)
+
+    @updated_by_admin = User.find(@issue.updated_by) if @issue.updated_by

   end
 
   def new
     unless create_new_issue_params.blank?
       @issue = Issue.find_or_initialize_by(create_new_issue_params)
   end
 
   def new
     unless create_new_issue_params.blank?
       @issue = Issue.find_or_initialize_by(create_new_issue_params)

-      puts params[:user_id].to_s + "--------------"
+      path = "issues.report_strings." + @issue.reportable.class.name.to_s
+      @report_strings_yaml = t(path)
+      flash[:referer] = params[:referer]

     end
   end
 
   def create
     end
   end
 
   def create

-    @issue = Issue.find_by_reportable_id_and_reportable_type(params[:reportable_id],params[:reportable_type])
-    if !@issue 
+    @issue = Issue.find_by_reportable_id_and_reportable_type(params[:reportable_id], params[:reportable_type])
+    # Check if Issue already exists
+    unless @issue

       @issue = Issue.find_or_initialize_by(issue_params)
       @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
+      @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 = @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
       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_to flash[:referer], :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

-    @report = @issue.reports.build(report_params)
-    @report.user_id = @user.id
-    if @issue.save!
-      redirect_to root_path, notice: 'Issue was successfully created.'
+  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 = 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_to flash[:referer], :notice => notice
+      end

     else
     else

-      render :new
+      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])
     end
   end
 
   def comment
     @issue = Issue.find(params[:id])

-    @issue_comment = @issue.comments.build(issue_comment_params)
-    @issue_comment.user_id = @user.id
-    @issue_comment.save!
-    redirect_to @issue
+    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 = @user.id
+      if params[:reassign]
+        reassign_issue
+        @issue_comment.reassign = true
+      end
+      @issue_comment.save!
+      @issue.updated_by = @user.id
+      @issue.save!
+      notice = t("issues.comment.comment_created")
+    end
+    redirect_to @issue, :notice => notice

   end
 
   # Status Transistions
   def resolve
     if @issue.resolve
       @issue.save!
   end
 
   # Status Transistions
   def resolve
     if @issue.resolve
       @issue.save!

-      redirect_to @issue, notice: "Issue status has been set to: 'Resolved'"
+      redirect_to @issue, :notice => t("issues.resolved")

     else
       render :show
     end
     else
       render :show
     end


@@ -61,8 +178,9 @@ class IssuesController < ApplicationController
 
   def ignore
     if @issue.ignore
 
   def ignore
     if @issue.ignore

+      @issue.updated_by = @user.id

       @issue.save!
       @issue.save!

-      redirect_to @issue, notice: "Issue status has been set to: 'Ignored'"
+      redirect_to @issue, :notice => t("issues.ignored")

     else
       render :show
     end
     else
       render :show
     end


@@ -70,39 +188,88 @@ class IssuesController < ApplicationController
 
   def reopen
     if @issue.reopen
 
   def reopen
     if @issue.reopen

+      @issue.updated_by = @user.id

       @issue.save!
       @issue.save!

-      redirect_to @issue, notice: "Issue status has been set to: 'Open'"
+      redirect_to @issue, :notice => t("issues.reopened")

     else
       render :show
     end
   end
 
     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
 
   private
 

-    def find_issue
-      @issue = Issue.find(params[:id])
+  def upgrade_issue(type)
+    if type == "moderator"
+      "administrator"
+    else
+      "moderator"

     end
     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, :user_id)
-    end
+  def setup_user_role
+    # Get user role
+    @user_role = @user.administrator? ? "administrator" : "moderator"
+  end

 
 

-    def issue_params
-      params.permit(:reportable_id, :reportable_type,: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
+      return true
+    else
+      return false

     end
     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, :user_id)
+  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 @user.administrator? || @user.moderator?
+      flash[:error] = t("application.require_admin.not_an_admin")
+      redirect_to root_path

     end
     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 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
 end