vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #27913 from frappe/app_logo

Browse source 
fix: default to frappe logo when more than 2 app logos are present
This commit is contained in:
Sumit Bhanushali 2024-09-27 13:17:42 +05:30 • committed by GitHub
commit 7e18a3944c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/core/doctype/navbar_settings/navbar_settings.py
View file

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

3
frappe/www/login.py
View file

@ -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")
)