Localisation updates from https://translatewiki.net.

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 44c19e322708a8b07c6ca75854988dbaba0782ca..c24054f77ff3adf4ab44073cea134c9748403b51 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -14,7 +14,7 @@ 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
     @issue_types.push("DiaryEntry", "DiaryComment", "User") if current_user.administrator?
 
     @users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct


@@ -24,7 +24,7 @@ class IssuesController < ApplicationController
     if params[:search_by_user].present?
       @find_user = User.find_by(:display_name => params[:search_by_user])
       if @find_user
     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_id => @find_user.id)
+        @issues = @issues.where(:reported_user => @find_user)

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


@@ -42,6 +42,7 @@ class IssuesController < ApplicationController
   end
 
   def show
   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