Browse Source

Refactor

pull/1007/head
Kat 4 years ago
parent
commit
34dd42cc55
  1. 4
      app/controllers/locations_controller.rb
  2. 3
      app/helpers/locations_helper.rb

4
app/controllers/locations_controller.rb

@ -43,7 +43,7 @@ class LocationsController < ApplicationController
end
def deactivate
if LocationDeactivationPeriod.create!(location_id: @location.id, deactivation_date: params[:deactivation_date]) && update_affected_logs
if @location.location_deactivation_periods.create!(location_id: @location.id, deactivation_date: params[:deactivation_date]) && reset_location_and_scheme_for_logs!
flash[:notice] = deactivate_success_notice
end
redirect_to scheme_location_path(@scheme, @location)
@ -213,7 +213,7 @@ private
end
end
def update_affected_logs
def reset_location_and_scheme_for_logs!
@location.lettings_logs.filter_by_before_startdate(params[:deactivation_date].to_time).update!(location: nil, scheme: nil)
end

3
app/helpers/locations_helper.rb

@ -77,7 +77,8 @@ private
end
def is_nested?(inner, outer)
return false if inner == outer || [inner.deactivation_date, inner.reactivation_date, outer.deactivation_date, outer.reactivation_date].any?(&:blank?)
return false if inner == outer
return false if [inner.deactivation_date, inner.reactivation_date, outer.deactivation_date, outer.reactivation_date].any?(&:blank?)
[inner.deactivation_date, inner.reactivation_date].all? { |date| date.between?(outer.deactivation_date, outer.reactivation_date) }
end

Loading…
Cancel
Save