Skip to content

Commit

Permalink
[#162281] Fix error when trying to remove an order detail (#4239)
Browse files Browse the repository at this point in the history
# Release Notes
* Fix error when trying to remove an order detail.
* Enable `walkup_reservations` and `cross_core_projects` feature flags.

# Screenshot

Optional.

# Additional Context

Optional. Feel free to add/modify additional headers as appropriate, e.g. "Refactorings", "Concerns".

# Accessibility
- [ ] Did you scan for accessibility issues?
- [ ] Did you check our accessibility goal checklist?
- [ ] Did you add accessibility [specs](https://github.com/dequelabs/axe-core-gems/blob/develop/packages/axe-core-rspec/README.md)?
  • Loading branch information
LeticiaErrandonea committed May 9, 2024
1 parent fd027c5 commit 654caff
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
13 changes: 5 additions & 8 deletions app/lib/ability.rb
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
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

0 comments on commit 654caff

Please sign in to comment.