From b970eb1541a48d4dc75acf6db264c0f85eb37e05 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Tue, 3 Jan 2023 22:04:59 +0530 Subject: [PATCH 1/3] fix: user doctype singles issue --- lms/hooks.py | 2 -- lms/overrides/user.py | 5 ----- lms/patches.txt | 1 + lms/patches/v0_0/user_singles_issue.py | 7 +++++++ 4 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 lms/patches/v0_0/user_singles_issue.py diff --git a/lms/hooks.py b/lms/hooks.py index a6b3e24c..d6b93393 100644 --- a/lms/hooks.py +++ b/lms/hooks.py @@ -287,6 +287,4 @@ profile_url_prefix = "/users/" signup_form_template = "lms.plugins.show_custom_signup" -on_login = "lms.overrides.user.on_login" - on_session_creation = "lms.overrides.user.on_session_creation" diff --git a/lms/overrides/user.py b/lms/overrides/user.py index b9fb1c35..8b948237 100644 --- a/lms/overrides/user.py +++ b/lms/overrides/user.py @@ -273,7 +273,6 @@ def sign_up(email, full_name, verify_terms, user_category): def set_country_from_ip(login_manager=None, user=None): if not user and login_manager: user = login_manager.user - user_country = frappe.db.get_value("User", user, "country") # if user_country: # return @@ -294,10 +293,6 @@ def get_country_code(): return -def on_login(login_manager): - set_country_from_ip() - - def on_session_creation(login_manager): if frappe.db.get_single_value("System Settings", "setup_complete"): frappe.local.response["home_page"] = "/courses" diff --git a/lms/patches.txt b/lms/patches.txt index ff4db784..473d1f7b 100644 --- a/lms/patches.txt +++ b/lms/patches.txt @@ -44,3 +44,4 @@ lms.patches.v0_0.rename_instructor_role lms.patches.v0_0.change_course_creation_settings #12-12-2022 lms.patches.v0_0.check_onboarding_status #21-12-2022 lms.patches.v0_0.assignment_file_type +lms.patches.v0_0.user_singles_issue #23-11-2022 diff --git a/lms/patches/v0_0/user_singles_issue.py b/lms/patches/v0_0/user_singles_issue.py new file mode 100644 index 00000000..fde32f1c --- /dev/null +++ b/lms/patches/v0_0/user_singles_issue.py @@ -0,0 +1,7 @@ +import frappe + +def execute(): + rows = frappe.db.sql("select field from `tabSingles` where doctype='User'", as_dict = True) + + if len(rows): + frappe.db.sql("delete from `tabSingles` where doctype='User'") From ec31c96120643a8a1e7db1e170f30c079808d5d5 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 4 Jan 2023 16:29:07 +0530 Subject: [PATCH 2/3] fix: linters --- lms/patches/v0_0/user_singles_issue.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lms/patches/v0_0/user_singles_issue.py b/lms/patches/v0_0/user_singles_issue.py index fde32f1c..8a0fdd1a 100644 --- a/lms/patches/v0_0/user_singles_issue.py +++ b/lms/patches/v0_0/user_singles_issue.py @@ -1,7 +1,10 @@ import frappe + def execute(): - rows = frappe.db.sql("select field from `tabSingles` where doctype='User'", as_dict = True) + rows = frappe.db.sql( + "select field from `tabSingles` where doctype='User'", as_dict=True + ) if len(rows): frappe.db.sql("delete from `tabSingles` where doctype='User'") From 281af15d65942c4be49d2b9e22f0dddb64958e21 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 4 Jan 2023 16:57:35 +0530 Subject: [PATCH 3/3] fix: converted query to qb --- lms/patches/v0_0/user_singles_issue.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lms/patches/v0_0/user_singles_issue.py b/lms/patches/v0_0/user_singles_issue.py index 8a0fdd1a..338dfca5 100644 --- a/lms/patches/v0_0/user_singles_issue.py +++ b/lms/patches/v0_0/user_singles_issue.py @@ -2,9 +2,9 @@ import frappe def execute(): - rows = frappe.db.sql( - "select field from `tabSingles` where doctype='User'", as_dict=True - ) + table = frappe.qb.DocType("Singles") + q = frappe.qb.from_(table).select(table.field).where(table.doctype == "User") + rows = q.run() if len(rows): - frappe.db.sql("delete from `tabSingles` where doctype='User'") + frappe.db.delete("Singles", {"doctype": "User"})