Handle issue_types properly if current_user is both and admin and a moderator

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index af130b4e94f93b8d8f999f09b595adece2edf222..6f4667a306286b83df397d1f0115ee3bb7d98198 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -3,19 +3,17 @@ 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]
 
   def index
-    if current_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
+    @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.where(:assigned_role => current_user.roles.map(&:role))
 
     # If search
@@ -24,29 +22,19 @@ class IssuesController < ApplicationController
       if @find_user
         @issues = @issues.where(:reported_user_id => @find_user.id)
       else
-        notice = t("issues.index.search.user_not_found")
+        notice = t("issues.index.user_not_found")
       end
     end
 
-    if params[:status] && params[:status][0].present?
-      @issues = @issues.where(:status => params[:status][0].to_i)
-    end
+    @issues = @issues.where(:status => params[:status][0]) if params[:status] && params[:status][0].present?
 
-    if params[:issue_type] && params[:issue_type][0].present?
-      @issues = @issues.where(:reportable_type => params[:issue_type][0])
-    end
+    @issues = @issues.where(:reportable_type => params[:issue_type][0]) if params[:issue_type] && params[:issue_type][0].present?
 
-    # If last_updated_by
     if params[:last_updated_by] && params[:last_updated_by][0].present?
       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
 
-    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)
-    end
-
     redirect_to issues_path, :notice => notice if notice
   end
 
@@ -54,7 +42,7 @@ class IssuesController < ApplicationController
     @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))
+    @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
 
@@ -90,47 +78,14 @@ class IssuesController < ApplicationController
 
   private
 
-  def set_issues
-    @admin_issues = %w[DiaryEntry DiaryComment User]
-    @moderator_issues = %w[Changeset Note]
-  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
-    else
-      false
-    end
-  end
-
   def find_issue
     @issue = Issue.find(params[:id])
   end
 
   def check_permission
     unless current_user.administrator? || current_user.moderator?
-      flash[:error] = t("application.require_admin.not_an_admin")
+      flash[:error] = t("application.require_moderator_or_admin.not_a_moderator_or_admin")
       redirect_to root_path
     end
   end
-
-  def issue_params
-    params[:issue].permit(:reportable_id, :reportable_type)
-  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