From ff17da300f361425f0e22ccd9066cb6577aa10ee Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Tue, 4 Dec 2012 09:10:03 +0000
Subject: Fixed event views to use dates, and to miss queries for days with no
events.
---
lib/mauve/web_interface.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'lib')
diff --git a/lib/mauve/web_interface.rb b/lib/mauve/web_interface.rb
index c6de5ff..5bb339a 100644
--- a/lib/mauve/web_interface.rb
+++ b/lib/mauve/web_interface.rb
@@ -528,13 +528,13 @@ EOF
query[:history][:created_at.gte] = Time.local(today.year, today.month, today.day, 0, 0, 0)
query[:history][:created_at.lt] = Time.local(tomorrow.year, tomorrow.month, tomorrow.day, 0, 0, 0)
- events = AlertHistory.all(formulate_events_query(query)).history
+ events = AlertHistory.all(formulate_events_query(query))
event_week = ((today - start)/7).floor
event_day = (today.wday == 0 ? 6 : (today.wday - 1))
@events_by_week[event_week] ||= Array.new(7) { Array.new }
- @events_by_week[event_week][event_day] = events
+ @events_by_week[event_week][event_day] = (events.count == 0 ? [] : events.history)
today = tomorrow
end
--
cgit v1.2.3