From 570f27467abca6cf989e6d9e9383e79cef44ce63 Mon Sep 17 00:00:00 2001 From: as-op Date: Tue, 27 Aug 2024 09:20:25 +0200 Subject: [PATCH 1/2] Simplify controller filters, apply suggestion of https://github.com/opf/openproject/pull/16364#discussion_r1731396582 --- app/controllers/work_packages_controller.rb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/app/controllers/work_packages_controller.rb b/app/controllers/work_packages_controller.rb index b2461ee0c4b4..61037af7ed2d 100644 --- a/app/controllers/work_packages_controller.rb +++ b/app/controllers/work_packages_controller.rb @@ -39,14 +39,12 @@ class WorkPackagesController < ApplicationController :project, only: :show before_action :load_and_authorize_in_optional_project, :check_allowed_export, - :protect_from_unauthorized_export, only: :index + :protect_from_unauthorized_export, %i[index export_dialog] authorization_checked! :index, :show, :export_dialog before_action :load_and_validate_query, only: :index, unless: -> { request.format.html? } before_action :load_work_packages, only: :index, if: -> { request.format.atom? } - - before_action :load_and_authorize_in_optional_project_for_export, only: :export_dialog, if: -> { request.format.html? } - before_action :load_and_validate_query_for_export, only: :export_dialog, if: -> { request.format.html? } + before_action :load_and_validate_query_for_export, only: :export_dialog def index respond_to do |format| @@ -94,10 +92,6 @@ def export_dialog protected - def load_and_authorize_in_optional_project_for_export - load_and_authorize_in_optional_project - end - def load_and_validate_query_for_export load_and_validate_query end From dbed8482eb19e349c1d223c466ecbf3d74f86eb3 Mon Sep 17 00:00:00 2001 From: as-op Date: Tue, 27 Aug 2024 09:39:42 +0200 Subject: [PATCH 2/2] missing keyword --- app/controllers/work_packages_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/work_packages_controller.rb b/app/controllers/work_packages_controller.rb index 61037af7ed2d..9e68b8b46495 100644 --- a/app/controllers/work_packages_controller.rb +++ b/app/controllers/work_packages_controller.rb @@ -39,7 +39,7 @@ class WorkPackagesController < ApplicationController :project, only: :show before_action :load_and_authorize_in_optional_project, :check_allowed_export, - :protect_from_unauthorized_export, %i[index export_dialog] + :protect_from_unauthorized_export, only: %i[index export_dialog] authorization_checked! :index, :show, :export_dialog before_action :load_and_validate_query, only: :index, unless: -> { request.format.html? }