vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #38805 from iamejaaz/64416-default-app

Browse source 
fix(BulkEdit): Default app options not populating
This commit is contained in:
Ejaaz Khan 2026-04-22 22:58:01 +05:30 • committed by GitHub
commit 6293525d97
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
frappe/core/doctype/user/user_list.js
View file

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

2
frappe/desk/reportview.py
View file

@ -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 = []