diff --git a/frappe/core/doctype/user/user_list.js b/frappe/core/doctype/user/user_list.js index 334ed0b370..d0688f7b83 100644 --- a/frappe/core/doctype/user/user_list.js +++ b/frappe/core/doctype/user/user_list.js @@ -4,6 +4,9 @@ frappe.listview_settings["User"] = { add_fields: ["enabled", "user_type", "user_image"], filters: [["enabled", "=", 1]], + onload(listview) { + this.set_default_app_options(listview); + }, prepare_data: function (data) { data["user_for_avatar"] = data["name"]; }, @@ -14,6 +17,15 @@ frappe.listview_settings["User"] = { return [__("Disabled"), "grey", "enabled,=,0"]; } }, + set_default_app_options(listview) { + const default_app_field = frappe.meta.get_docfield("User", "default_app"); + if (!default_app_field) return; + + frappe.xcall("frappe.apps.get_apps").then((r) => { + let apps = r?.map((r) => r.name) || []; + default_app_field.options = [" ", ...apps].join("\n"); + }); + }, }; frappe.help.youtube_id["User"] = "8Slw1hsTmUI"; diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index 87859e2d39..7d48bc2f6f 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -735,7 +735,7 @@ def get_stats(stats: str, doctype: str, filters: str | None = None): try: db_columns = frappe.db.get_table_columns(doctype) - except frappe.db.InternalError, frappe.db.ProgrammingError: + except (frappe.db.InternalError, frappe.db.ProgrammingError): # raised when _user_tags column is added on the fly # raised if its a virtual doctype db_columns = []