Parcourir la source

fix: Merge error

version-14
Suraj Shetty il y a 4 ans
Parent
révision
eff2388cee
1 fichiers modifiés avec 2 ajouts et 1 suppressions
  1. +2
    -1
      frappe/desk/desktop.py

+ 2
- 1
frappe/desk/desktop.py Voir le fichier

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


Chargement…
Annuler
Enregistrer