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

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 72952894624195f734efc61925c363492a458c22..5cedb3c705b5eeaeb42647057cb8de3c3cec7c8b 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -1,43 +1,54 @@
 class IssuesController < ApplicationController
 class IssuesController < ApplicationController

+  include PaginationMethods
+

   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
 
   def index

+    @params = params.permit(:before, :after, :limit, :status, :search_by_user, :issue_type, :last_updated_by)
+    @params[:limit] ||= 50

     @title = t ".title"
 
     @issue_types = []
     @title = t ".title"
 
     @issue_types = []

-    @issue_types.concat %w[Note] if current_user.moderator?
-    @issue_types.concat %w[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
 
     @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 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])
       @find_user = User.find_by(:display_name => params[:search_by_user])

-      if @find_user
-        @issues = @issues.where(:reported_user_id => @find_user.id)
-      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
 
     end
 

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

 
 

-    @issues = @issues.where(:reportable_type => params[:issue_type]) if params[:issue_type] && params[:issue_type].present?
+    @issues = @issues.where(:reportable_type => params[:issue_type]) if params[:issue_type].present?

 
 

-    if params[:last_updated_by] && params[:last_updated_by].present?
+    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
       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, @newer_issues_id, @older_issues_id = get_page_items(@issues, :limit => @params[:limit])
+    render :partial => "page" if turbo_frame_request_id == "pagination"

   end
 
   def show
   end
 
   def show

+    @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


@@ -45,9 +56,10 @@ 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!
       redirect_to @issue, :notice => t(".resolved")
     else
       @issue.save!
       redirect_to @issue, :notice => t(".resolved")
     else


@@ -78,13 +90,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