fix: check in_import before exporting
This commit is contained in:
parent
0eef9d9ef5
commit
2def9cd40f
3 changed files with 9 additions and 7 deletions
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue