Parcourir la source

fix: Fetch page title for core pages

version-14
Faris Ansari il y a 6 ans
Parent
révision
2e811b1603
1 fichiers modifiés avec 11 ajouts et 8 suppressions
  1. +11
    -8
      frappe/boot.py

+ 11
- 8
frappe/boot.py Voir le fichier

@@ -113,22 +113,25 @@ def get_user_pages_or_reports(parent):
column = get_column(parent)

# get pages or reports set on custom role
custom_roles = frappe.db.sql("""
pages_with_custom_roles = frappe.db.sql("""
select
`tabCustom Role`.{field} as name,
`tabCustom Role`.modified,
`tabCustom Role`.ref_doctype
from `tabCustom Role`, `tabHas Role`
`tabCustom Role`.ref_doctype,
{column}
from `tabCustom Role`, `tabHas Role`, `tab{parent}`
where
`tabHas Role`.parent = `tabCustom Role`.name
and `tab{parent}`.name = `tabCustom Role`.{field}
and `tabCustom Role`.{field} is not null
and `tabHas Role`.role in ({roles})
""".format(field=parent.lower(), roles = ', '.join(['%s']*len(roles))), roles, as_dict=1)
""".format(field=parent.lower(), parent=parent, column=column,
roles = ', '.join(['%s']*len(roles))), roles, as_dict=1)

for p in custom_roles:
has_role[p.name] = {"modified":p.modified, "title": p.name, "ref_doctype": p.ref_doctype}
for p in pages_with_custom_roles:
has_role[p.name] = {"modified":p.modified, "title": p.title, "ref_doctype": p.ref_doctype}

standard_roles = frappe.db.sql("""
pages_with_standard_roles = frappe.db.sql("""
select distinct
`tab{parent}`.name as name,
`tab{parent}`.modified,
@@ -145,7 +148,7 @@ def get_user_pages_or_reports(parent):
field=parent.lower(), condition="and `tabReport`.disabled=0" if parent == "Report" else ""),
roles, as_dict=True)

for p in standard_roles:
for p in pages_with_standard_roles:
if p.name not in has_role:
has_role[p.name] = {"modified":p.modified, "title": p.title}
if parent == "Report":


Chargement…
Annuler
Enregistrer