From: Tom Hughes <tom@compton.nu>
Date: Tue, 19 Sep 2023 08:33:03 +0000 (+0100)
Subject: Allow banners to have a start date as well as an end date
X-Git-Tag: live~1062
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/29c51d7915eb85ce1fc319809866a3a7f143d392

Allow banners to have a start date as well as an end date
---

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