From ae1c887b584cd7f3c679bd9fd8a3b98f825c848b Mon Sep 17 00:00:00 2001 From: Maverjk Carter <3779181+maverjk@users.noreply.github.com> Date: Tue, 22 Oct 2024 19:34:23 +0200 Subject: [PATCH 1/3] fix: check app logo from website settings before checking navbar settings (cherry picked from commit 3db7f7a674930c864fa0aa6ed89cc43d2e32c46f) --- frappe/core/doctype/navbar_settings/navbar_settings.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/navbar_settings/navbar_settings.py b/frappe/core/doctype/navbar_settings/navbar_settings.py index 4cbfc3a847..38421d0c4c 100644 --- a/frappe/core/doctype/navbar_settings/navbar_settings.py +++ b/frappe/core/doctype/navbar_settings/navbar_settings.py @@ -24,7 +24,10 @@ class NavbarSettings(Document): def get_app_logo(): - app_logo = frappe.db.get_single_value("Navbar Settings", "app_logo", cache=True) + app_logo = frappe.get_website_settings("app_logo") + if not app_logo: + app_logo = frappe.db.get_single_value("Navbar Settings", "app_logo", cache=True) + if not app_logo: logos = frappe.get_hooks("app_logo_url") app_logo = logos[0] From bdaa979159925d85c5904fba01b05ac9b13ff062 Mon Sep 17 00:00:00 2001 From: gavin Date: Tue, 29 Oct 2024 12:44:46 +0100 Subject: [PATCH 2/3] chore: "or" over "if not" pattern Co-authored-by: Akhil Narang (cherry picked from commit e7e7ee0ec15d73c1e59cc34b93253ad21d619e0a) --- frappe/core/doctype/navbar_settings/navbar_settings.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frappe/core/doctype/navbar_settings/navbar_settings.py b/frappe/core/doctype/navbar_settings/navbar_settings.py index 38421d0c4c..b69241c981 100644 --- a/frappe/core/doctype/navbar_settings/navbar_settings.py +++ b/frappe/core/doctype/navbar_settings/navbar_settings.py @@ -24,9 +24,7 @@ class NavbarSettings(Document): def get_app_logo(): - app_logo = frappe.get_website_settings("app_logo") - if not app_logo: - app_logo = frappe.db.get_single_value("Navbar Settings", "app_logo", cache=True) + app_logo = frappe.get_website_settings("app_logo") or frappe.db.get_single_value("Navbar Settings", "app_logo", cache=True) if not app_logo: logos = frappe.get_hooks("app_logo_url") From 6aeccbb669064a0c3a0f654d744a2395b688ef61 Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Tue, 5 Nov 2024 12:59:42 +0530 Subject: [PATCH 3/3] chore: format Signed-off-by: Akhil Narang (cherry picked from commit ddc0d6007c2dd93a177717eec4178fb4db4d3620) --- frappe/core/doctype/navbar_settings/navbar_settings.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/navbar_settings/navbar_settings.py b/frappe/core/doctype/navbar_settings/navbar_settings.py index b69241c981..08fda8a8b6 100644 --- a/frappe/core/doctype/navbar_settings/navbar_settings.py +++ b/frappe/core/doctype/navbar_settings/navbar_settings.py @@ -24,8 +24,10 @@ class NavbarSettings(Document): def get_app_logo(): - app_logo = frappe.get_website_settings("app_logo") or frappe.db.get_single_value("Navbar Settings", "app_logo", cache=True) - + app_logo = frappe.get_website_settings("app_logo") or frappe.db.get_single_value( + "Navbar Settings", "app_logo", cache=True + ) + if not app_logo: logos = frappe.get_hooks("app_logo_url") app_logo = logos[0]