Merge branch 'develop' into pr/imxuwang/3799

This commit is contained in:
Matthias 2020-10-22 08:05:09 +02:00
commit 50e7418d24

View File

@ -747,7 +747,7 @@ class PairLock(_DECL_BASE):
func.datetime(PairLock.lock_end_time) >= now, func.datetime(PairLock.lock_end_time) >= now,
# Only active locks # Only active locks
PairLock.active.is_(True), PairLock.active.is_(True),
).scalar() is not None ).first() is not None
def to_json(self) -> Dict[str, Any]: def to_json(self) -> Dict[str, Any]:
return { return {