diff --git a/app/controllers/locations_controller.rb b/app/controllers/locations_controller.rb index 2983a1305..5ae052c3b 100644 --- a/app/controllers/locations_controller.rb +++ b/app/controllers/locations_controller.rb @@ -62,7 +62,7 @@ class LocationsController < ApplicationController flash[:notice] = reactivate_success_notice redirect_to scheme_location_path(@scheme, @location) else - render "toggle_active", locals: { action: "deactivate" }, status: :unprocessable_entity + render "toggle_active", locals: { action: "reactivate" }, status: :unprocessable_entity end end diff --git a/app/helpers/locations_helper.rb b/app/helpers/locations_helper.rb index 9885707a4..9940086e1 100644 --- a/app/helpers/locations_helper.rb +++ b/app/helpers/locations_helper.rb @@ -48,7 +48,8 @@ module LocationsHelper sorted_deactivation_periods = location.location_deactivation_periods.sort_by(&:deactivation_date) deactivation_open = false sorted_deactivation_periods.each do |deactivation| - availability << " to #{(deactivation.deactivation_date - 1.day).to_formatted_s(:govuk_date)}\nDeactivated on #{deactivation.deactivation_date.to_formatted_s(:govuk_date)}" unless deactivation_open + from = deactivation.deactivation_date == location.available_from ? deactivation.deactivation_date : deactivation.deactivation_date - 1.day + availability << " to #{from.to_formatted_s(:govuk_date)}\nDeactivated on #{deactivation.deactivation_date.to_formatted_s(:govuk_date)}" unless deactivation_open if deactivation.reactivation_date.present? availability << "\nActive from #{deactivation.reactivation_date.to_formatted_s(:govuk_date)}" deactivation_open = false