fireinfo: Let get_profile() return only valid profiles

diff --git a/webapp/backend/fireinfo.py b/webapp/backend/fireinfo.py
index b4b742481263cf2d8e3320ee29835b77aade3cea..3f4be9779ae9596cee349129a633c71cb577ba86 100644 (file)
--- a/webapp/backend/fireinfo.py
+++ b/webapp/backend/fireinfo.py
@@ -1496,10 +1496,9 @@ class Fireinfo(Object):
                res = self.db.get("SELECT * FROM fireinfo_profiles \
                        WHERE public_id = %s AND \
                                (CASE WHEN %s IS NULL THEN TRUE ELSE private_id = %s END) AND \
-                               (CASE WHEN %s IS NULL THEN TRUE ELSE \
-                                       then_or_now(%s) BETWEEN time_created AND time_valid END) \
-                       ORDER BY time_updated DESC LIMIT 1", public_id,
-                       private_id, private_id, when, when)
+                               then_or_now(%s) BETWEEN time_created AND time_valid \
+                       ORDER BY time_updated DESC LIMIT 1",
+                       public_id, private_id, private_id, when)
 
                if res:
                        return Profile(self.backend, res.id, res)