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

fix: Merge error

Browse source
This commit is contained in:
Suraj Shetty 2020-11-06 10:57:21 +05:30
parent b5d9c1e816
commit eff2388cee
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frappe/desk/desktop.py
View file

@ -378,7 +378,8 @@ def get_desk_sidebar_items(flatten=False, cache=True):
# pages sorted based on pinned to top and then by name
order_by = "pin_to_top desc, pin_to_bottom asc, name asc"
all_pages = frappe.get_all("Desk Page", fields=["name", "category", "icon", "module"]], filters=filters, order_by=order_by, ignore_permissions=True)
all_pages = frappe.get_all("Desk Page", fields=["name", "category", "icon", "module"],
filters=filters, order_by=order_by, ignore_permissions=True)
pages = []
# Filter Page based on Permission