Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#162281] Fix error when trying to remove an order detail #4239

Merged
merged 2 commits into from
May 9, 2024
Merged

[#162281] Fix error when trying to remove an order detail #4239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
524c775
Enable feature flags
LeticiaErrandonea May 9, 2024
99d3109
Fix bug
LeticiaErrandonea May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions app/lib/ability.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,18 +184,15 @@ def facility_administrator_abilities(user, resource, controller)
elsif controller.is_a?(ReservationsController) && resource.is_a?(Reservation)
project = resource.order_detail.order.cross_core_project

return if project.nil?

original_order = project.orders.first

can :manage, Reservation if user.facility_administrator_of?(original_order.facility)
if project.present?
original_order = project.orders.first
can :manage, Reservation if user.facility_administrator_of?(original_order.facility)
end
elsif controller.is_a?(FacilityOrderDetailsController) && resource.is_a?(Facility) && SettingsHelper.feature_on?(:cross_core_projects)
can [:destroy], OrderDetail do |order_detail|
project = order_detail.order.cross_core_project

return false if project.blank?

user.facility_administrator_of?(project.facility) || user.facility_administrator_of?(order_detail.order.facility)
project.present? && (user.facility_administrator_of?(project.facility) || user.facility_administrator_of?(order_detail.order.facility))
end
end

Expand Down
4 changes: 2 additions & 2 deletions config/settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ feature:
facility_tile_list: <%= ENV.fetch("FACILITY_TILE_LIST", false) %>
facility_tile_list_admin: false
po_require_affiliate_account: true
walkup_reservations: <%= ENV.fetch("WALKUP_RESERVATIONS", Rails.env.staging? || Rails.env.development?) %>
cross_core_projects: <%= ENV.fetch("CROSS_CORE_PROJECTS", Rails.env.staging? || Rails.env.development?) %>
walkup_reservations: true
cross_core_projects: true

split_accounts:
# Roles are allowed to create Split Accounts
Expand Down
Loading