Browse Source

lint

pull/1007/head
Kat 4 years ago
parent
commit
e563ec55b2
  1. 2
      app/helpers/locations_helper.rb

2
app/helpers/locations_helper.rb

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

Loading…
Cancel
Save