From eff2388cee5ab415113ff22612c26cd81d555ef2 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 6 Nov 2020 10:57:21 +0530 Subject: [PATCH] fix: Merge error --- frappe/desk/desktop.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 3e874f45f8..4d5c904f56 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -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