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

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 10b626cd1fc0c7bcfd3dc6568c9bab5f9329337b..124b29effc20aabc6657fc560947d6123ac5250c 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -2,43 +2,43 @@ class IssuesController < ApplicationController
   layout "site"
 
   before_action :authorize_web
   layout "site"
 
   before_action :authorize_web

-  before_action :require_user
-  before_action :check_permission
+  before_action :set_locale
+  before_action :check_database_readable
+
+  authorize_resource
+

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

+  before_action :check_database_writable, :only => [:resolve, :ignore, :reopen]

 
   def index
     @title = t ".title"
 
 
   def index
     @title = t ".title"
 

-    if current_user.moderator?
-      @issue_types = %w[Note]
-      @users = User.joins(:roles).where(:user_roles => { :role => "moderator" })
-    else
-      @issue_types = %w[DiaryEntry DiaryComment User]
-      @users = User.joins(:roles).where(:user_roles => { :role => "administrator" })
-    end
+    @issue_types = []
+    @issue_types.push("Note") if current_user.moderator?
+    @issue_types.push("DiaryEntry", "DiaryComment", "User") if current_user.administrator?

 
 

-    @issues = Issue.where(:assigned_role => current_user.roles.map(&:role))
+    @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 search

-    if params[:search_by_user] && 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
         @issues = @issues.where(:reported_user_id => @find_user.id)
       else
       @find_user = User.find_by(:display_name => params[:search_by_user])
       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
 
       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]&.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]&.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]&.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
       @issues = @issues.where(:updated_by => last_updated_by)
     end

-
-    redirect_to issues_path, :notice => notice if notice

   end
 
   def show
   end
 
   def show


@@ -49,11 +49,12 @@ class IssuesController < ApplicationController
     @new_comment = IssueComment.new(:issue => @issue)
   end
 
     @new_comment = IssueComment.new(:issue => @issue)
   end
 

-  # Status Transistions
+  # Status Transitions

   def resolve
     if @issue.resolve
   def resolve
     if @issue.resolve

+      @issue.updated_by = current_user.id

       @issue.save!
       @issue.save!

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

     else
       render :show
     end
     else
       render :show
     end


@@ -63,7 +64,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


@@ -73,7 +74,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


@@ -82,13 +83,8 @@ class IssuesController < ApplicationController
   private
 
   def find_issue
   private
 
   def find_issue

-    @issue = Issue.find(params[:id])
-  end
-
-  def check_permission
-    unless current_user.administrator? || current_user.moderator?
-      flash[:error] = t("application.require_moderator_or_admin.not_a_moderator_or_admin")
-      redirect_to root_path
-    end
+    @issue = Issue.visible_to(current_user).find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    redirect_to :controller => "errors", :action => "not_found"

   end
 end
   end
 end