Browse Source

rename variable for clarity

pull/2995/head
Carolyn 2 months ago
parent
commit
d95ff45477
  1. 6
      app/models/location_deactivation_period.rb
  2. 6
      app/models/scheme_deactivation_period.rb

6
app/models/location_deactivation_period.rb

@ -3,9 +3,9 @@ class LocationDeactivationPeriodValidator < ActiveModel::Validator
def validate(record) def validate(record)
location = record.location location = record.location
recent_deactivation = location.location_deactivation_periods.deactivations_without_reactivation.first open_deactivation = location.location_deactivation_periods.deactivations_without_reactivation.first
if recent_deactivation.present? && recent_deactivation.deactivation_date <= 6.months.from_now if open_deactivation.present? && open_deactivation.deactivation_date <= 6.months.from_now
validate_reactivation(record, recent_deactivation, location) validate_reactivation(record, open_deactivation, location)
else else
validate_deactivation(record, location) validate_deactivation(record, location)
end end

6
app/models/scheme_deactivation_period.rb

@ -3,9 +3,9 @@ class SchemeDeactivationPeriodValidator < ActiveModel::Validator
def validate(record) def validate(record)
scheme = record.scheme scheme = record.scheme
recent_deactivation = scheme.scheme_deactivation_periods.deactivations_without_reactivation.first open_deactivation = scheme.scheme_deactivation_periods.deactivations_without_reactivation.first
if recent_deactivation.present? && recent_deactivation.deactivation_date <= 6.months.from_now if open_deactivation.present? && open_deactivation.deactivation_date <= 6.months.from_now
validate_reactivation(record, recent_deactivation, scheme) validate_reactivation(record, open_deactivation, scheme)
else else
validate_deactivation(record, scheme) validate_deactivation(record, scheme)
end end

Loading…
Cancel
Save