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

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 6f4667a306286b83df397d1f0115ee3bb7d98198..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
+  before_action :set_locale
   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
-    @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?
@@ -22,20 +23,19 @@ class IssuesController < ApplicationController
       if @find_user
         @issues = @issues.where(:reported_user_id => @find_user.id)
       else
-        notice = t("issues.index.user_not_found")
+        @issues = @issues.none
+        flash.now[:warning] = t(".user_not_found")
       end
     end
 
-    @issues = @issues.where(:status => params[:status][0]) if params[:status] && params[:status][0].present?
+    @issues = @issues.where(:status => params[:status]) if params[:status] && params[:status].present?
 
-    @issues = @issues.where(:reportable_type => params[:issue_type][0]) if params[:issue_type] && params[:issue_type][0].present?
+    @issues = @issues.where(:reportable_type => params[:issue_type]) if params[:issue_type] && params[:issue_type].present?
 
-    if params[:last_updated_by] && params[:last_updated_by][0].present?
-      last_updated_by = params[:last_updated_by][0].to_s == "nil" ? nil : params[:last_updated_by][0].to_i
+    if params[:last_updated_by] && 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
-
-    redirect_to issues_path, :notice => notice if notice
   end
 
   def show
@@ -50,7 +50,7 @@ class IssuesController < ApplicationController
   def resolve
     if @issue.resolve
       @issue.save!
-      redirect_to @issue, :notice => t("issues.resolved")
+      redirect_to @issue, :notice => t(".resolved")
     else
       render :show
     end
@@ -60,7 +60,7 @@ class IssuesController < ApplicationController
     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
@@ -70,7 +70,7 @@ class IssuesController < ApplicationController
     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