ensure that default deactivation and reactivation dates also reflect the changes

3 years ago · 5ab7d9775c
2 changed files with 2 additions and 2 deletions
--- a/app/controllers/locations_controller.rb
+++ b/app/controllers/locations_controller.rb
@ -269,7 +269,7 @@ private
    if params[:location_deactivation_period].blank?
      return
    elsif params[:location_deactivation_period]["#{key}_type".to_sym] == "default"
-      return FormHandler.instance.current_collection_start_date
+      return FormHandler.instance.start_date_of_earliest_open_collection_period
    elsif params[:location_deactivation_period][key.to_sym].present?
      return params[:location_deactivation_period][key.to_sym]
    end
--- a/app/controllers/schemes_controller.rb
+++ b/app/controllers/schemes_controller.rb
@ -296,7 +296,7 @@ private
    if params[:scheme_deactivation_period].blank?
      return
    elsif params[:scheme_deactivation_period]["#{key}_type".to_sym] == "default"
-      return FormHandler.instance.current_collection_start_date
+      return FormHandler.instance.start_date_of_earliest_open_collection_period
    elsif params[:scheme_deactivation_period][key.to_sym].present?
      return params[:scheme_deactivation_period][key.to_sym]
    end