From ca0e53f613b0133d3b71eb2c069310a220efaf71 Mon Sep 17 00:00:00 2001 From: Brian Simpson Date: Sun, 12 Jan 2014 04:55:05 -0500 Subject: [PATCH] PromotedLinkTraffic: better handle campaigns that end early. --- r2/r2/lib/pages/trafficpages.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/r2/r2/lib/pages/trafficpages.py b/r2/r2/lib/pages/trafficpages.py index cbfac6d8b..3c0944679 100644 --- a/r2/r2/lib/pages/trafficpages.py +++ b/r2/r2/lib/pages/trafficpages.py @@ -638,6 +638,12 @@ class PromotedLinkTraffic(Templated): """Shorten range for display and add next/prev buttons.""" start, end = promote.get_traffic_dates(thing) + # Check date of latest traffic (campaigns can end early). + history = get_promo_traffic(thing, start, end) + end = max(date for date, data in history) + end = end.replace(tzinfo=g.tz) # get_promo_traffic returns tz naive + # datetimes but is actually g.tz + if self.period: display_start = self.after display_end = self.before