diff --git a/frappe/desk/doctype/workspace_sidebar/workspace_sidebar.py b/frappe/desk/doctype/workspace_sidebar/workspace_sidebar.py index 5dced4efd8..fa34d9994f 100644 --- a/frappe/desk/doctype/workspace_sidebar/workspace_sidebar.py +++ b/frappe/desk/doctype/workspace_sidebar/workspace_sidebar.py @@ -28,8 +28,9 @@ class WorkspaceSidebar(Document): # end: auto-generated types def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - self.user = frappe.get_user() - self.can_read = self.get_cached("user_perm_can_read", self.get_can_read_items) + if not frappe.flags.in_migrate: + self.user = frappe.get_user() + self.can_read = self.get_cached("user_perm_can_read", self.get_can_read_items) self.allowed_pages = get_allowed_pages(cache=True) self.allowed_reports = get_allowed_reports(cache=True) diff --git a/frappe/modules/utils.py b/frappe/modules/utils.py index cefdac1b33..924b874be9 100644 --- a/frappe/modules/utils.py +++ b/frappe/modules/utils.py @@ -6,8 +6,8 @@ Utilities for using modules import json import os -from pathlib import Path import shutil +from pathlib import Path from textwrap import dedent, indent from typing import TYPE_CHECKING, Union diff --git a/frappe/www/desk.py b/frappe/www/desk.py index 114bd62292..24da48335b 100644 --- a/frappe/www/desk.py +++ b/frappe/www/desk.py @@ -34,7 +34,7 @@ def get_context(context): # this needs commit csrf_token = frappe.sessions.get_csrf_token() - frappe.db.commit() + frappe.db.commit() # nosemgrep hooks = frappe.get_hooks() app_include_js = hooks.get("app_include_js", []) + frappe.conf.get("app_include_js", [])