Merge remote-tracking branch 'upstream/pull/4492'

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 124b29effc20aabc6657fc560947d6123ac5250c..c24054f77ff3adf4ab44073cea134c9748403b51 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -14,34 +14,35 @@ class IssuesController < ApplicationController
     @title = t ".title"
 
     @issue_types = []
     @title = t ".title"
 
     @issue_types = []

-    @issue_types.push("Note") if current_user.moderator?
+    @issue_types.push("Note", "User") if current_user.moderator?

     @issue_types.push("DiaryEntry", "DiaryComment", "User") if current_user.administrator?
 
     @users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct
     @issues = Issue.visible_to(current_user).order(:updated_at => :desc)
 
     # If search
     @issue_types.push("DiaryEntry", "DiaryComment", "User") if current_user.administrator?
 
     @users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct
     @issues = Issue.visible_to(current_user).order(:updated_at => :desc)
 
     # If search

-    if params[:search_by_user]&.present?
+    if params[:search_by_user].present?

       @find_user = User.find_by(:display_name => params[:search_by_user])
       if @find_user
       @find_user = User.find_by(:display_name => params[:search_by_user])
       if @find_user

-        @issues = @issues.where(:reported_user_id => @find_user.id)
+        @issues = @issues.where(:reported_user => @find_user)

       else
         @issues = @issues.none
         flash.now[:warning] = t(".user_not_found")
       end
     end
 
       else
         @issues = @issues.none
         flash.now[:warning] = t(".user_not_found")
       end
     end
 

-    @issues = @issues.where(:status => params[:status]) if params[:status]&.present?
+    @issues = @issues.where(:status => params[:status]) if params[:status].present?

 
 

-    @issues = @issues.where(:reportable_type => params[:issue_type]) if params[:issue_type]&.present?
+    @issues = @issues.where(:reportable_type => params[:issue_type]) if params[:issue_type].present?

 
 

-    if params[:last_updated_by]&.present?
+    if 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
   end
 
   def show
       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
   end
 
   def show

+    @title = t ".title", :status => @issue.status.humanize, :issue_id => @issue.id

     @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