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

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index f53a8dad55aeb7588aaf23511eaaa87cd9b02608..5cedb3c705b5eeaeb42647057cb8de3c3cec7c8b 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -18,8 +18,8 @@ class IssuesController < ApplicationController
     @title = t ".title"
 
     @issue_types = []
     @title = t ".title"
 
     @issue_types = []

-    @issue_types.push("Note", "User") if current_user.moderator?
-    @issue_types.push("DiaryEntry", "DiaryComment", "User") if current_user.administrator?
+    @issue_types |= %w[Note User] if current_user.moderator?
+    @issue_types |= %w[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)
 
     @users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct
     @issues = Issue.visible_to(current_user)


@@ -27,12 +27,11 @@ class IssuesController < ApplicationController
     # If search
     if params[:search_by_user].present?
       @find_user = User.find_by(:display_name => params[:search_by_user])
     # If search
     if params[:search_by_user].present?
       @find_user = User.find_by(:display_name => params[:search_by_user])

-      if @find_user
-        @issues = @issues.where(:reported_user => @find_user)
-      else
-        @issues = @issues.none
-        flash.now[:warning] = t(".user_not_found")
-      end
+      @issues = if @find_user
+                  @issues.where(:reported_user => @find_user)
+                else
+                  @issues.none
+                end

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


@@ -49,7 +48,7 @@ class IssuesController < ApplicationController
   end
 
   def show
   end
 
   def show

-    @title = t ".title", :status => @issue.status.humanize, :issue_id => @issue.id
+    @title = t ".title.#{@issue.status}", :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