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 a8eeee8b383f43889a21d7787d3f00488b991ad3..d4e9a3bdfa4bec2c7e745b200c67e52a307ff086 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -2,6 +2,7 @@ class IssuesController < ApplicationController
   layout "site"
 
   before_action :authorize_web
   layout "site"
 
   before_action :authorize_web

+  before_action :set_locale

   before_action :require_user
   before_action :check_permission
   before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore]
   before_action :require_user
   before_action :check_permission
   before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore]


@@ -14,7 +15,7 @@ class IssuesController < ApplicationController
     @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
     @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))
+    @issues = Issue.visible_to(current_user)

 
     # If search
     if params[:search_by_user] && params[:search_by_user].present?
 
     # If search
     if params[:search_by_user] && params[:search_by_user].present?


@@ -23,7 +24,7 @@ class IssuesController < ApplicationController
         @issues = @issues.where(:reported_user_id => @find_user.id)
       else
         @issues = @issues.none
         @issues = @issues.where(:reported_user_id => @find_user.id)
       else
         @issues = @issues.none

-        flash.now[:warning] = t("issues.index.user_not_found")
+        flash.now[:warning] = t(".user_not_found")

       end
     end
 
       end
     end
 


@@ -49,7 +50,7 @@ class IssuesController < ApplicationController
   def resolve
     if @issue.resolve
       @issue.save!
   def resolve
     if @issue.resolve
       @issue.save!

-      redirect_to @issue, :notice => t("issues.resolved")
+      redirect_to @issue, :notice => t(".resolved")

     else
       render :show
     end
     else
       render :show
     end


@@ -59,7 +60,7 @@ class IssuesController < ApplicationController
     if @issue.ignore
       @issue.updated_by = current_user.id
       @issue.save!
     if @issue.ignore
       @issue.updated_by = current_user.id
       @issue.save!

-      redirect_to @issue, :notice => t("issues.ignored")
+      redirect_to @issue, :notice => t(".ignored")

     else
       render :show
     end
     else
       render :show
     end


@@ -69,7 +70,7 @@ class IssuesController < ApplicationController
     if @issue.reopen
       @issue.updated_by = current_user.id
       @issue.save!
     if @issue.reopen
       @issue.updated_by = current_user.id
       @issue.save!

-      redirect_to @issue, :notice => t("issues.reopened")
+      redirect_to @issue, :notice => t(".reopened")

     else
       render :show
     end
     else
       render :show
     end