diff --git a/frappe/apps.py b/frappe/apps.py index 69da6b3783..fa43856313 100644 --- a/frappe/apps.py +++ b/frappe/apps.py @@ -79,7 +79,7 @@ def get_default_path(): return get_route(user_default_app) if len(_apps) == 1: - return _apps[0].get("route") or "/apps" + return _apps[0].get("route") or "/desk" elif is_desk_apps(_apps): return "/desk" return "/apps" diff --git a/frappe/desk/doctype/desktop_icon/desktop_icon.py b/frappe/desk/doctype/desktop_icon/desktop_icon.py index 804df89516..cc93f15f6e 100644 --- a/frappe/desk/doctype/desktop_icon/desktop_icon.py +++ b/frappe/desk/doctype/desktop_icon/desktop_icon.py @@ -44,9 +44,11 @@ class DesktopIcon(Document): def on_trash(self): clear_desktop_icons_cache() - if frappe.conf.developer_mode: - if self.standard == 1 and self.app: - self.delete_desktop_icon_file() + allow_export = ( + self.standard and self.app and not frappe.flags.in_import and frappe.conf.developer_mode + ) + if allow_export: + self.delete_desktop_icon_file() def on_update(self): if frappe.conf.developer_mode: diff --git a/frappe/desk/doctype/workspace_sidebar/workspace_sidebar.py b/frappe/desk/doctype/workspace_sidebar/workspace_sidebar.py index b05827f509..0c6027ad6b 100644 --- a/frappe/desk/doctype/workspace_sidebar/workspace_sidebar.py +++ b/frappe/desk/doctype/workspace_sidebar/workspace_sidebar.py @@ -46,9 +46,9 @@ class WorkspaceSidebar(Document): self.user.build_permissions() def before_save(self): - if frappe.conf.developer_mode: - if self.app: - self.export_sidebar() + allow_export = self.app and not frappe.flags.in_import and frappe.conf.developer_mode + if allow_export: + self.export_sidebar() self.set_module() def export_sidebar(self):