Use select_tag for issue filter fields instead of abusing select

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index dfaff63b1a2bdc72d87a8d4d34532e2662dd41bb..deec96b7a4f11c8391738fd3ef4ebd22659cd5e1 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -3,21 +3,17 @@ class IssuesController < ApplicationController
 
   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]
 
   def index
     @title = t ".title"
 
-    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
+    @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
@@ -30,12 +26,12 @@ class IssuesController < ApplicationController
       end
     end
 
-    @issues = @issues.where(:status => params[:status][0]) if params[:status] && params[:status][0].present?
+    @issues = @issues.where(:status => params[:status]) if params[:status] && params[:status].present?
 
-    @issues = @issues.where(:reportable_type => params[:issue_type][0]) if params[:issue_type] && params[:issue_type][0].present?
+    @issues = @issues.where(:reportable_type => params[:issue_type]) if params[:issue_type] && params[:issue_type].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].present?
+      last_updated_by = params[:last_updated_by].to_s == "nil" ? nil : params[:last_updated_by].to_i
       @issues = @issues.where(:updated_by => last_updated_by)
     end
 
@@ -82,11 +78,6 @@ class IssuesController < ApplicationController
 
   private
 
-  def set_issues
-    @admin_issues = %w[DiaryEntry DiaryComment User]
-    @moderator_issues = %w[Note]
-  end
-
   def find_issue
     @issue = Issue.find(params[:id])
   end