From ed4c0654482e533402633f94c98779959660a612 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Wed, 23 Nov 2022 14:20:58 +0000 Subject: [PATCH] fix: find deactivation periods by scheme/location ids rather than just the first --- app/controllers/locations_controller.rb | 4 ++-- app/controllers/schemes_controller.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/locations_controller.rb b/app/controllers/locations_controller.rb index 766501260..b3f3ab203 100644 --- a/app/controllers/locations_controller.rb +++ b/app/controllers/locations_controller.rb @@ -50,12 +50,12 @@ class LocationsController < ApplicationController end def new_reactivation - @location_deactivation_period = LocationDeactivationPeriod.deactivations_without_reactivation.first + @location_deactivation_period = @location.location_deactivation_periods.deactivations_without_reactivation.first render "toggle_active", locals: { action: "reactivate" } end def reactivate - @location_deactivation_period = LocationDeactivationPeriod.deactivations_without_reactivation.first + @location_deactivation_period = @location.location_deactivation_periods.deactivations_without_reactivation.first @location_deactivation_period.reactivation_date = toggle_date("reactivation_date") @location_deactivation_period.reactivation_date_type = params[:location_deactivation_period][:reactivation_date_type] diff --git a/app/controllers/schemes_controller.rb b/app/controllers/schemes_controller.rb index 53ee6fe40..415db5c7a 100644 --- a/app/controllers/schemes_controller.rb +++ b/app/controllers/schemes_controller.rb @@ -51,12 +51,12 @@ class SchemesController < ApplicationController end def new_reactivation - @scheme_deactivation_period = SchemeDeactivationPeriod.deactivations_without_reactivation.first + @scheme_deactivation_period = @scheme.scheme_deactivation_periods.deactivations_without_reactivation.first render "toggle_active", locals: { action: "reactivate" } end def reactivate - @scheme_deactivation_period = SchemeDeactivationPeriod.deactivations_without_reactivation.first + @scheme_deactivation_period = @scheme.scheme_deactivation_periods.deactivations_without_reactivation.first @scheme_deactivation_period.reactivation_date = toggle_date("reactivation_date") @scheme_deactivation_period.reactivation_date_type = params[:scheme_deactivation_period][:reactivation_date_type]