From 4ed10de918bfa05d9e38675868e42e92cede805f Mon Sep 17 00:00:00 2001 From: Aradhya-Tripathi Date: Thu, 14 Oct 2021 23:25:43 +0530 Subject: [PATCH] fix: fixed sider issues --- frappe/core/doctype/activity_log/activity_log.py | 9 ++++++--- frappe/sessions.py | 3 +-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/frappe/core/doctype/activity_log/activity_log.py b/frappe/core/doctype/activity_log/activity_log.py index 183a1c264c..9c27e84740 100644 --- a/frappe/core/doctype/activity_log/activity_log.py +++ b/frappe/core/doctype/activity_log/activity_log.py @@ -7,6 +7,8 @@ from frappe.utils import get_fullname, now from frappe.model.document import Document from frappe.core.utils import set_timeline_doc import frappe +from frappe.query_builder import DocType, Interval +from frappe.query_builder.functions import Now class ActivityLog(Document): def before_insert(self): @@ -44,6 +46,7 @@ def clear_activity_logs(days=None): if not days: days = 90 - - frappe.db.sql("""delete from `tabActivity Log` where \ - creation< (NOW() - INTERVAL '{0}' DAY)""".format(days)) \ No newline at end of file + doctype = DocType("Activity Log") + frappe.qb.from_(doctype).where( + doctype.creation < (Now() - Interval(days=days)) + ).delete().run() \ No newline at end of file diff --git a/frappe/sessions.py b/frappe/sessions.py index 508badbd8f..05f3bba3cf 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -64,8 +64,7 @@ def get_sessions_to_clear(user=None, keep_current=False, device=None): offset = simultaneous_sessions - 1 table = frappe.qb.DocType("Sessions") - criterion = frappe.qb.from_(table).where(table.user == user) \ - .where(table.device.isin(device)) + criterion = frappe.qb.from_(table).where((table.user == user) & (table.device.isin(device))) if keep_current: criterion = criterion.where(table.sid != frappe.db.escape(frappe.session.sid))