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] 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]