From 759f8306b6e274a7a4e3dceed6c507365796c6d6 Mon Sep 17 00:00:00 2001 From: Sumit Bhanushali Date: Fri, 27 Sep 2024 13:03:56 +0530 Subject: [PATCH] fix: default to frappe logo when more than 2 app logos are present --- frappe/core/doctype/navbar_settings/navbar_settings.py | 5 ++++- frappe/www/login.py | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/navbar_settings/navbar_settings.py b/frappe/core/doctype/navbar_settings/navbar_settings.py index 55e33cd61a..4cbfc3a847 100644 --- a/frappe/core/doctype/navbar_settings/navbar_settings.py +++ b/frappe/core/doctype/navbar_settings/navbar_settings.py @@ -26,7 +26,10 @@ class NavbarSettings(Document): def get_app_logo(): app_logo = frappe.db.get_single_value("Navbar Settings", "app_logo", cache=True) if not app_logo: - app_logo = frappe.get_hooks("app_logo_url")[-1] + logos = frappe.get_hooks("app_logo_url") + app_logo = logos[0] + if len(logos) == 2: + app_logo = logos[1] return app_logo diff --git a/frappe/www/login.py b/frappe/www/login.py index 4806989f3c..48fdf71fb0 100644 --- a/frappe/www/login.py +++ b/frappe/www/login.py @@ -9,6 +9,7 @@ import frappe.utils from frappe import _ from frappe.apps import get_default_path from frappe.auth import LoginManager +from frappe.core.doctype.navbar_settings.navbar_settings import get_app_logo from frappe.rate_limiter import rate_limit from frappe.utils import cint, get_url from frappe.utils.data import escape_html @@ -44,7 +45,7 @@ def get_context(context): context["disable_signup"] = cint(frappe.get_website_settings("disable_signup")) context["show_footer_on_login"] = cint(frappe.get_website_settings("show_footer_on_login")) context["disable_user_pass_login"] = cint(frappe.get_system_settings("disable_user_pass_login")) - context["logo"] = frappe.get_website_settings("app_logo") or frappe.get_hooks("app_logo_url")[-1] + context["logo"] = get_app_logo() context["app_name"] = ( frappe.get_website_settings("app_name") or frappe.get_system_settings("app_name") or _("Frappe") )