Skip to content

Commit

Permalink
Merge pull request #16530 from opf/fix/48274-work-packages-export-mod…
Browse files Browse the repository at this point in the history
…al-with-settings-and-job-status-modal

Simplify work packages controller filters
  • Loading branch information
as-op authored Aug 27, 2024
2 parents b07d996 + dbed848 commit 0f6219f
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions app/controllers/work_packages_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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, only: %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|
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 0f6219f

Please sign in to comment.