From f093a1699e33f0e41cf970aafd2624aac8389bb5 Mon Sep 17 00:00:00 2001 From: gregor herrmann Date: Thu, 2 Aug 2018 11:41:54 +0200 Subject: [PATCH 1/1] oops, looks like we made a logic error when refactoring --- web/seepark_web.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/seepark_web.py b/web/seepark_web.py index a6d3930..82715dc 100644 --- a/web/seepark_web.py +++ b/web/seepark_web.py @@ -75,7 +75,7 @@ def select_sensordata(sensor_id, sensor_type, begin, end, mode): query = query.filter(Sensors.timestamp >= begin) if end is not None: query = query.filter(Sensors.timestamp <= end) - if mode == 'consolidated' and begin is None and end is None: + if mode == 'consolidated' and begin is not None and end is not None: # copied from munin/master/_bin/munin-cgi-graph.in # interval in seconds for data points resolutions = dict( @@ -106,7 +106,7 @@ def select_openweatherdata(cityid, begin, end, mode): query = query.filter(OpenWeatherMap.datetime >= begin) if end is not None: query = query.filter(OpenWeatherMap.datetime <= end) - if mode == 'consolidated' and begin is None and end is None: + if mode == 'consolidated' and begin is not None and end is not None: # copied from munin/master/_bin/munin-cgi-graph.in # interval in seconds for data points resolutions = dict( -- 2.47.3