Handle current_user being both an admin and a moderator for building user list

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 7f455b9e9290529f6eaeaf972d0288032465c234..c2470dc5b5898218d4c837a0339e6ba5140c2996 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -3,7 +3,6 @@ class IssuesController < ApplicationController
 
   before_action :authorize_web
   before_action :require_user
 
   before_action :authorize_web
   before_action :require_user

-  before_action :set_issues

   before_action :check_permission
   before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore]
 
   before_action :check_permission
   before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore]
 


@@ -11,13 +10,12 @@ class IssuesController < ApplicationController
     @title = t ".title"
 
     if current_user.moderator?
     @title = t ".title"
 
     if current_user.moderator?

-      @issue_types = @moderator_issues
-      @users = User.joins(:roles).where(:user_roles => { :role => "moderator" })
+      @issue_types = %w[Note]

     else
     else

-      @issue_types = @admin_issues
-      @users = User.joins(:roles).where(:user_roles => { :role => "administrator" })
+      @issue_types = %w[DiaryEntry DiaryComment User]

     end
 
     end
 

+    @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
     @issues = Issue.where(:assigned_role => current_user.roles.map(&:role))
 
     # If search


@@ -30,13 +28,9 @@ class IssuesController < ApplicationController
       end
     end
 
       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 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
 
     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


@@ -50,7 +44,7 @@ class IssuesController < ApplicationController
     @read_reports = @issue.read_reports
     @unread_reports = @issue.unread_reports
     @comments = @issue.comments
     @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
 
     @new_comment = IssueComment.new(:issue => @issue)
   end
 


@@ -86,47 +80,14 @@ class IssuesController < ApplicationController
 
   private
 
 
   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?
   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
       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
 end