X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/781b5166ce49d339090ffee7f53a9996ed91148f..29c51d7915eb85ce1fc319809866a3a7f143d392:/app/helpers/banner_helper.rb diff --git a/app/helpers/banner_helper.rb b/app/helpers/banner_helper.rb index 17c6eace3..9048d4840 100644 --- a/app/helpers/banner_helper.rb +++ b/app/helpers/banner_helper.rb @@ -1,13 +1,19 @@ module BannerHelper def active_banners BANNERS.reject do |_k, v| - enddate = v[:enddate] begin - parsed = enddate && Date.parse(enddate) + startdate = v[:startdate] && Date.parse(v[:startdate]) rescue StandardError - parsed = nil + startdate = nil end - !parsed.is_a?(Date) || (parsed.is_a?(Date) && parsed.past?) + + begin + enddate = v[:enddate] && Date.parse(v[:enddate]) + rescue StandardError + enddate = nil + end + + startdate&.future? || enddate&.past? end end