Browse Source

fix: find deactivation periods by scheme/location ids rather than just the first

pull/1023/head
natdeanlewissoftwire 4 years ago
parent
commit
ed4c065448
  1. 4
      app/controllers/locations_controller.rb
  2. 4
      app/controllers/schemes_controller.rb

4
app/controllers/locations_controller.rb

@ -50,12 +50,12 @@ class LocationsController < ApplicationController
end end
def new_reactivation 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" } render "toggle_active", locals: { action: "reactivate" }
end end
def reactivate 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 = toggle_date("reactivation_date")
@location_deactivation_period.reactivation_date_type = params[:location_deactivation_period][:reactivation_date_type] @location_deactivation_period.reactivation_date_type = params[:location_deactivation_period][:reactivation_date_type]

4
app/controllers/schemes_controller.rb

@ -51,12 +51,12 @@ class SchemesController < ApplicationController
end end
def new_reactivation 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" } render "toggle_active", locals: { action: "reactivate" }
end end
def reactivate 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 = toggle_date("reactivation_date")
@scheme_deactivation_period.reactivation_date_type = params[:scheme_deactivation_period][:reactivation_date_type] @scheme_deactivation_period.reactivation_date_type = params[:scheme_deactivation_period][:reactivation_date_type]

Loading…
Cancel
Save