Changed report button + Added disclaimer on report page + Added search filter

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index ecac5bd1677bc324a1c70dd6a4cff119ea727a54..a499dad9de9ab5311abe6df92b57ebdf91b5c824 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -13,8 +13,10 @@ class IssuesController < ApplicationController
   def index
     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)
@@ -42,6 +44,11 @@ class IssuesController < ApplicationController
         notice = t('issues.index.search.issues_not_found')      
     end
 
+    if params[:last_reported_by] and !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
+
     if notice
       redirect_to issues_path, notice: notice
     end