').appendTo(
@@ -105,7 +105,7 @@ frappe.ui.form.on("User", {
}
if (
- in_list(["System User", "Website User"], frm.doc.user_type) &&
+ ["System User", "Website User"].includes(frm.doc.user_type) &&
!frm.is_new() &&
!frm.roles_editor &&
frm.can_edit_roles
diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 1a13a20e4e..f727d02120 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -1052,7 +1052,7 @@ def user_query(doctype, txt, searchfield, start, page_len, filters):
user_type_condition = "and user_type != 'Website User'"
if filters and filters.get("ignore_user_type") and frappe.session.data.user_type == "System User":
user_type_condition = ""
- filters.pop("ignore_user_type")
+ filters and filters.pop("ignore_user_type", None)
txt = f"%{txt}%"
return frappe.db.sql(
diff --git a/frappe/core/page/permission_manager/permission_manager.js b/frappe/core/page/permission_manager/permission_manager.js
index f06e583bee..f25ec6d4ad 100644
--- a/frappe/core/page/permission_manager/permission_manager.js
+++ b/frappe/core/page/permission_manager/permission_manager.js
@@ -251,7 +251,7 @@ frappe.PermissionEngine = class PermissionEngine {
this.rights.forEach((r) => {
if (!d.is_submittable && ["submit", "cancel", "amend"].includes(r)) return;
- if (d.in_create && ["create", "write", "delete"].includes(r)) return;
+ if (d.in_create && ["create", "delete"].includes(r)) return;
this.add_check(perm_container, d, r);
});
diff --git a/frappe/core/workspace/build/build.json b/frappe/core/workspace/build/build.json
index 81d86c346f..ad6cd2d287 100644
--- a/frappe/core/workspace/build/build.json
+++ b/frappe/core/workspace/build/build.json
@@ -1,6 +1,6 @@
{
"charts": [],
- "content": "[{\"id\":\"5nnLaQeoFa\",\"type\":\"header\",\"data\":{\"text\":\"
Your Shortcuts\",\"col\":12}},{\"id\":\"HXRmktXYHy\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"DocType\",\"col\":3}},{\"id\":\"pYALX3MwBW\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Customize Form\",\"col\":3}},{\"id\":\"XC78DuYB65\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Report\",\"col\":3}},{\"id\":\"XPm50Ppq3J\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Client Script\",\"col\":3}},{\"id\":\"yoU6nWiT83\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Server Script\",\"col\":3}},{\"id\":\"5UgFESBY0N\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Print Format Builder\",\"col\":3}},{\"id\":\"0gE0s-S70E\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Learn Frappe Framework\",\"col\":3}},{\"id\":\"62hseENHbd\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"tOCrOgLW1G\",\"type\":\"header\",\"data\":{\"text\":\"
Elements\",\"col\":12}},{\"id\":\"BIHjudL0T_\",\"type\":\"card\",\"data\":{\"card_name\":\"Modules\",\"col\":4}},{\"id\":\"cJ6CVsa8qW\",\"type\":\"card\",\"data\":{\"card_name\":\"Models\",\"col\":4}},{\"id\":\"MmEJpjEdGR\",\"type\":\"card\",\"data\":{\"card_name\":\"Views\",\"col\":4}},{\"id\":\"2ZdtgxQZqq\",\"type\":\"card\",\"data\":{\"card_name\":\"Customization\",\"col\":4}},{\"id\":\"NPFolijIcb\",\"type\":\"card\",\"data\":{\"card_name\":\"Scripting\",\"col\":4}},{\"id\":\"iK3JQ9RXJE\",\"type\":\"card\",\"data\":{\"card_name\":\"Packages\",\"col\":4}},{\"id\":\"TiO9FCUUeC\",\"type\":\"card\",\"data\":{\"card_name\":\"System Logs\",\"col\":4}}]",
+ "content": "[{\"id\":\"5nnLaQeoFa\",\"type\":\"header\",\"data\":{\"text\":\"
Get started
\",\"col\":12}},{\"id\":\"HXRmktXYHy\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"DocType\",\"col\":3}},{\"id\":\"pYALX3MwBW\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Customize Form\",\"col\":3}},{\"id\":\"XC78DuYB65\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Report\",\"col\":3}},{\"id\":\"XPm50Ppq3J\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Client Script\",\"col\":3}},{\"id\":\"yoU6nWiT83\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Server Script\",\"col\":3}},{\"id\":\"5UgFESBY0N\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Print Format Builder\",\"col\":3}},{\"id\":\"0gE0s-S70E\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"System Settings\",\"col\":3}},{\"id\":\"62hseENHbd\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"tOCrOgLW1G\",\"type\":\"header\",\"data\":{\"text\":\"
Components to build your app\",\"col\":12}},{\"id\":\"cJ6CVsa8qW\",\"type\":\"card\",\"data\":{\"card_name\":\"Models\",\"col\":4}},{\"id\":\"MmEJpjEdGR\",\"type\":\"card\",\"data\":{\"card_name\":\"Views\",\"col\":4}},{\"id\":\"2ZdtgxQZqq\",\"type\":\"card\",\"data\":{\"card_name\":\"Customization\",\"col\":4}},{\"id\":\"NPFolijIcb\",\"type\":\"card\",\"data\":{\"card_name\":\"Scripting\",\"col\":4}},{\"id\":\"BIHjudL0T_\",\"type\":\"card\",\"data\":{\"card_name\":\"Modules\",\"col\":4}},{\"id\":\"iK3JQ9RXJE\",\"type\":\"card\",\"data\":{\"card_name\":\"Packages\",\"col\":4}},{\"id\":\"TiO9FCUUeC\",\"type\":\"card\",\"data\":{\"card_name\":\"System Logs\",\"col\":4}}]",
"creation": "2021-01-02 10:51:16.579957",
"custom_blocks": [],
"docstatus": 0,
@@ -8,7 +8,7 @@
"for_user": "",
"hide_custom": 0,
"icon": "tool",
- "idx": 0,
+ "idx": 1,
"is_hidden": 0,
"label": "Build",
"links": [
@@ -115,46 +115,6 @@
"onboard": 0,
"type": "Link"
},
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Modules",
- "link_count": 3,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Module Def",
- "link_count": 0,
- "link_to": "Module Def",
- "link_type": "DocType",
- "onboard": 0,
- "only_for": "",
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Module Onboarding",
- "link_count": 0,
- "link_to": "Module Onboarding",
- "link_type": "DocType",
- "onboard": 0,
- "only_for": "",
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Module Profile",
- "link_count": 0,
- "link_to": "Module Profile",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
{
"hidden": 0,
"is_query_report": 0,
@@ -321,9 +281,40 @@
"link_type": "DocType",
"onboard": 0,
"type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Modules",
+ "link_count": 2,
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Card Break"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Module Def",
+ "link_count": 0,
+ "link_to": "Module Def",
+ "link_type": "DocType",
+ "onboard": 0,
+ "only_for": "",
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Module Onboarding",
+ "link_count": 0,
+ "link_to": "Module Onboarding",
+ "link_type": "DocType",
+ "onboard": 0,
+ "only_for": "",
+ "type": "Link"
}
],
- "modified": "2023-07-04 14:34:09.420325",
+ "modified": "2024-01-02 15:38:42.806824",
"modified_by": "Administrator",
"module": "Core",
"name": "Build",
@@ -346,8 +337,9 @@
{
"color": "Grey",
"doc_view": "List",
- "label": "Learn Frappe Framework",
- "type": "URL",
+ "label": "System Settings",
+ "link_to": "System Settings",
+ "type": "DocType",
"url": "https://frappe.school/courses/frappe-framework-course?utm_source=in_app"
},
{
diff --git a/frappe/core/workspace/settings/settings.json b/frappe/core/workspace/settings/settings.json
deleted file mode 100644
index 24e534ce19..0000000000
--- a/frappe/core/workspace/settings/settings.json
+++ /dev/null
@@ -1,383 +0,0 @@
-{
- "charts": [],
- "content": "[{\"id\":\"bc3WecV0uU\",\"type\":\"header\",\"data\":{\"text\":\"
Settings\",\"col\":12}},{\"id\":\"_6Jxax2I11\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"System Settings\",\"col\":3}},{\"id\":\"rbf1Om8zJG\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Print Settings\",\"col\":3}},{\"id\":\"xMytWpIImZ\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Website Settings\",\"col\":3}},{\"id\":\"Q9DPlmrPpX\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"oVwctUh0gf\",\"type\":\"header\",\"data\":{\"text\":\"
Reports & Masters\",\"col\":12}},{\"id\":\"hC0b24aSJG\",\"type\":\"card\",\"data\":{\"card_name\":\"Data\",\"col\":4}},{\"id\":\"JA_iI4Z0yI\",\"type\":\"card\",\"data\":{\"card_name\":\"Email / Notifications\",\"col\":4}},{\"id\":\"F1GxSqFKy9\",\"type\":\"card\",\"data\":{\"card_name\":\"Website\",\"col\":4}},{\"id\":\"vugObM_K_T\",\"type\":\"card\",\"data\":{\"card_name\":\"Core\",\"col\":4}},{\"id\":\"XwKthiuAAW\",\"type\":\"card\",\"data\":{\"card_name\":\"Printing\",\"col\":4}},{\"id\":\"EQY7Sfmdxn\",\"type\":\"card\",\"data\":{\"card_name\":\"Workflow\",\"col\":4}}]",
- "creation": "2020-03-02 15:09:40.527211",
- "custom_blocks": [],
- "docstatus": 0,
- "doctype": "Workspace",
- "for_user": "",
- "hide_custom": 0,
- "icon": "setting",
- "idx": 0,
- "is_hidden": 0,
- "label": "Settings",
- "links": [
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Data",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Import Data",
- "link_count": 0,
- "link_to": "Data Import",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Export Data",
- "link_count": 0,
- "link_to": "Data Export",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Bulk Update",
- "link_count": 0,
- "link_to": "Bulk Update",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Download Backups",
- "link_count": 0,
- "link_to": "backups",
- "link_type": "Page",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Deleted Documents",
- "link_count": 0,
- "link_to": "Deleted Document",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Email / Notifications",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Email Account",
- "link_count": 0,
- "link_to": "Email Account",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Email Domain",
- "link_count": 0,
- "link_to": "Email Domain",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Notification",
- "link_count": 0,
- "link_to": "Notification",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Email Template",
- "link_count": 0,
- "link_to": "Email Template",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Auto Email Report",
- "link_count": 0,
- "link_to": "Auto Email Report",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Newsletter",
- "link_count": 0,
- "link_to": "Newsletter",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Notification Settings",
- "link_count": 0,
- "link_to": "Notification Settings",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Website",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Website Settings",
- "link_count": 0,
- "link_to": "Website Settings",
- "link_type": "DocType",
- "onboard": 1,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Website Theme",
- "link_count": 0,
- "link_to": "Website Theme",
- "link_type": "DocType",
- "onboard": 1,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Website Script",
- "link_count": 0,
- "link_to": "Website Script",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "About Us Settings",
- "link_count": 0,
- "link_to": "About Us Settings",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Contact Us Settings",
- "link_count": 0,
- "link_to": "Contact Us Settings",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Printing",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Print Format Builder",
- "link_count": 0,
- "link_to": "print-format-builder",
- "link_type": "Page",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Print Settings",
- "link_count": 0,
- "link_to": "Print Settings",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Print Format",
- "link_count": 0,
- "link_to": "Print Format",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Print Style",
- "link_count": 0,
- "link_to": "Print Style",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Workflow",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Workflow",
- "link_count": 0,
- "link_to": "Workflow",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Workflow State",
- "link_count": 0,
- "link_to": "Workflow State",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Workflow Action",
- "link_count": 0,
- "link_to": "Workflow Action",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Core",
- "link_count": 2,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "System Settings",
- "link_count": 0,
- "link_to": "System Settings",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Domain Settings",
- "link_count": 0,
- "link_to": "Domain Settings",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- }
- ],
- "modified": "2023-05-24 14:58:44.010999",
- "modified_by": "Administrator",
- "module": "Core",
- "name": "Settings",
- "number_cards": [],
- "owner": "Administrator",
- "parent_page": "",
- "public": 1,
- "quick_lists": [],
- "restrict_to_domain": "",
- "roles": [],
- "sequence_id": 18.0,
- "shortcuts": [
- {
- "icon": "setting",
- "label": "System Settings",
- "link_to": "System Settings",
- "type": "DocType"
- },
- {
- "icon": "printer",
- "label": "Print Settings",
- "link_to": "Print Settings",
- "type": "DocType"
- },
- {
- "icon": "website",
- "label": "Website Settings",
- "link_to": "Website Settings",
- "type": "DocType"
- }
- ],
- "title": "Settings"
-}
\ No newline at end of file
diff --git a/frappe/core/workspace/users/users.json b/frappe/core/workspace/users/users.json
index 53ba10c0f9..3899ad534b 100644
--- a/frappe/core/workspace/users/users.json
+++ b/frappe/core/workspace/users/users.json
@@ -1,6 +1,6 @@
{
"charts": [],
- "content": "[{\"type\":\"header\",\"data\":{\"text\":\"
Your Shortcuts\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"User\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Role\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Permission Manager\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"User Profile\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"User Type\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"
Reports & Masters\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Users\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Logs\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Permissions\",\"col\":4}}]",
+ "content": "[{\"id\":\"YpGCeLfign\",\"type\":\"header\",\"data\":{\"text\":\"
Your Shortcuts\",\"col\":12}},{\"id\":\"b7abeqw4NZ\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"User\",\"col\":3}},{\"id\":\"eghSJPhZRC\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Role\",\"col\":3}},{\"id\":\"uAzl_lT_C0\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Permission Manager\",\"col\":3}},{\"id\":\"EpBz2lplSt\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"User Profile\",\"col\":3}},{\"id\":\"vHWhzaFoAH\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"User Type\",\"col\":3}},{\"id\":\"oFB4l28FMU\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"yJNNylguxk\",\"type\":\"header\",\"data\":{\"text\":\"
Reports & Masters\",\"col\":12}},{\"id\":\"NMpIkExl3i\",\"type\":\"card\",\"data\":{\"card_name\":\"Users\",\"col\":4}},{\"id\":\"VepG3durKm\",\"type\":\"card\",\"data\":{\"card_name\":\"Logs\",\"col\":4}},{\"id\":\"S9FeWt7xXE\",\"type\":\"card\",\"data\":{\"card_name\":\"Permissions\",\"col\":4}}]",
"creation": "2020-03-02 15:12:16.754449",
"custom_blocks": [],
"docstatus": 0,
@@ -12,47 +12,6 @@
"is_hidden": 0,
"label": "Users",
"links": [
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Users",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "User",
- "link_count": 0,
- "link_to": "User",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Role",
- "link_count": 0,
- "link_to": "Role",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Role Profile",
- "link_count": 0,
- "link_to": "Role Profile",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
{
"hidden": 0,
"is_query_report": 0,
@@ -145,9 +104,61 @@
"link_type": "Report",
"onboard": 0,
"type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Users",
+ "link_count": 4,
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Card Break"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "User",
+ "link_count": 0,
+ "link_to": "User",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Role",
+ "link_count": 0,
+ "link_to": "Role",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Role Profile",
+ "link_count": 0,
+ "link_to": "Role Profile",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Module Profile",
+ "link_count": 0,
+ "link_to": "Module Profile",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
}
],
- "modified": "2023-05-24 14:47:23.619182",
+ "modified": "2024-01-02 15:39:13.811700",
"modified_by": "Administrator",
"module": "Core",
"name": "Users",
diff --git a/frappe/custom/doctype/custom_field/custom_field.js b/frappe/custom/doctype/custom_field/custom_field.js
index 6e3ab9a249..38c234a507 100644
--- a/frappe/custom/doctype/custom_field/custom_field.js
+++ b/frappe/custom/doctype/custom_field/custom_field.js
@@ -67,7 +67,7 @@ frappe.ui.form.on("Custom Field", {
return v.value;
});
- if (insert_after == null || !in_list(fieldnames, insert_after)) {
+ if (insert_after == null || !fieldnames.includes(insert_after)) {
insert_after = fieldnames[-1];
}
diff --git a/frappe/custom/doctype/custom_field/custom_field.py b/frappe/custom/doctype/custom_field/custom_field.py
index e84e0dd712..ce86da5e91 100644
--- a/frappe/custom/doctype/custom_field/custom_field.py
+++ b/frappe/custom/doctype/custom_field/custom_field.py
@@ -362,7 +362,8 @@ def rename_fieldname(custom_field: str, fieldname: str):
frappe.msgprint(_("Old and new fieldnames are same."), alert=True)
return
- frappe.db.rename_column(parent_doctype, old_fieldname, new_fieldname)
+ if frappe.db.has_column(field.dt, old_fieldname):
+ frappe.db.rename_column(parent_doctype, old_fieldname, new_fieldname)
# Update in DB after alter column is successful, alter column will implicitly commit, so it's
# best to commit change on field too to avoid any possible mismatch between two.
diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js
index e2fb630af3..92765653df 100644
--- a/frappe/custom/doctype/customize_form/customize_form.js
+++ b/frappe/custom/doctype/customize_form/customize_form.js
@@ -81,7 +81,7 @@ frappe.ui.form.on("Customize Form", {
add_customize_child_table_button: function (frm) {
frm.doc.fields.forEach(function (f) {
- if (!in_list(["Table", "Table MultiSelect"], f.fieldtype)) return;
+ if (!["Table", "Table MultiSelect"].includes(f.fieldtype)) return;
frm.add_custom_button(
__(f.options),
diff --git a/frappe/custom/doctype/property_setter/property_setter.js b/frappe/custom/doctype/property_setter/property_setter.js
index 955e01c33e..d8df5d1ec0 100644
--- a/frappe/custom/doctype/property_setter/property_setter.js
+++ b/frappe/custom/doctype/property_setter/property_setter.js
@@ -3,7 +3,7 @@
frappe.ui.form.on("Property Setter", {
validate: function (frm) {
- if (frm.doc.property_type == "Check" && !in_list(["0", "1"], frm.doc.value)) {
+ if (frm.doc.property_type == "Check" && !["0", "1"].includes(frm.doc.value)) {
frappe.throw(__("Value for a check field can be either 0 or 1"));
}
},
diff --git a/frappe/database/db_manager.py b/frappe/database/db_manager.py
index 01c18d69c4..4e1404084e 100644
--- a/frappe/database/db_manager.py
+++ b/frappe/database/db_manager.py
@@ -57,7 +57,7 @@ class DbManager:
from frappe.database import get_command
from frappe.utils import execute_in_shell
- command = []
+ command = ["set -o pipefail;"]
if source.endswith(".gz"):
if gzip := which("gzip"):
diff --git a/frappe/database/postgres/setup_db.py b/frappe/database/postgres/setup_db.py
index f5f3b14006..5118a38509 100644
--- a/frappe/database/postgres/setup_db.py
+++ b/frappe/database/postgres/setup_db.py
@@ -1,7 +1,9 @@
import os
+import re
import frappe
from frappe.database.db_manager import DbManager
+from frappe.utils import cint
def setup_database():
@@ -13,6 +15,11 @@ def setup_database():
root_conn.sql(f"CREATE DATABASE `{frappe.conf.db_name}`")
root_conn.sql(f"CREATE user {frappe.conf.db_name} password '{frappe.conf.db_password}'")
root_conn.sql("GRANT ALL PRIVILEGES ON DATABASE `{0}` TO {0}".format(frappe.conf.db_name))
+ if psql_version := root_conn.sql("SELECT VERSION()", as_dict=True):
+ version_string = psql_version[0].get("version") or "PostgreSQL 14"
+ major_version = cint(re.split(r"[\w\.]", version_string)[1])
+ if major_version > 15:
+ root_conn.sql("ALTER DATABASE `{0}` OWNER TO {0}".format(frappe.conf.db_name))
root_conn.close()
diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index a7c9a5ef0c..742bb15176 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -565,7 +565,7 @@ def save_new_widget(doc, page, blocks, new_widgets):
page, json_config, e
)
doc.log_error("Could not save customization", log)
- return False
+ raise
return True
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 2385860115..8e008e30c6 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -109,7 +109,7 @@ def get(
refresh=None,
):
if chart_name:
- chart = frappe.get_doc("Dashboard Chart", chart_name)
+ chart: DashboardChart = frappe.get_doc("Dashboard Chart", chart_name)
else:
chart = frappe._dict(frappe.parse_json(chart))
@@ -207,13 +207,14 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date):
filters.append([doctype, datefield, ">=", from_date, False])
filters.append([doctype, datefield, "<=", to_date, False])
- data = frappe.db.get_list(
+ data = frappe.get_list(
doctype,
fields=[datefield, f"SUM({value_field})", "COUNT(*)"],
filters=filters,
group_by=datefield,
order_by=datefield,
as_list=True,
+ parent_doctype=chart.parent_document_type,
)
result = get_result(data, timegrain, from_date, to_date, chart.chart_type)
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index 9fc12a1e0d..eec086f3bb 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -10,7 +10,7 @@ from frappe.model.naming import append_number_if_name_exists
from frappe.modules.export_file import export_to_files
from frappe.query_builder import Criterion
from frappe.query_builder.utils import DocType
-from frappe.utils import cint
+from frappe.utils import cint, flt
class NumberCard(Document):
@@ -165,7 +165,7 @@ def get_result(doc, filters, to_date=None):
)
number = res[0]["result"] if res else 0
- return cint(number)
+ return flt(number)
@frappe.whitelist()
diff --git a/frappe/desk/doctype/system_console/system_console.js b/frappe/desk/doctype/system_console/system_console.js
index e04ab59fdb..c43f95ee19 100644
--- a/frappe/desk/doctype/system_console/system_console.js
+++ b/frappe/desk/doctype/system_console/system_console.js
@@ -41,6 +41,10 @@ frappe.ui.form.on("System Console", {
frm.get_field("sql_output").html("");
}
}
+
+ const field = frm.get_field("console");
+ field.df.options = frm.doc.type;
+ field.set_language();
},
render_sql_output: function (frm) {
diff --git a/frappe/desk/doctype/tag/tag.py b/frappe/desk/doctype/tag/tag.py
index f71afef6da..0ebfb3b9c4 100644
--- a/frappe/desk/doctype/tag/tag.py
+++ b/frappe/desk/doctype/tag/tag.py
@@ -109,7 +109,7 @@ class DocTags:
tags = ""
else:
tl = unique(filter(lambda x: x, tl))
- tags = "," + ",".join(tl)
+ tags = ",".join(tl)
try:
frappe.db.sql(
"update `tab{}` set _user_tags={} where name={}".format(self.dt, "%s", "%s"), (tags, dn)
diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py
index 758681b0dc..cd0bb949ca 100644
--- a/frappe/desk/doctype/workspace/workspace.py
+++ b/frappe/desk/doctype/workspace/workspace.py
@@ -277,7 +277,6 @@ def save_page(title, public, new_widgets, blocks):
doc = frappe.get_doc("Workspace", pages[0])
doc.content = blocks
- doc.save(ignore_permissions=True)
save_new_widget(doc, title, blocks, new_widgets)
diff --git a/frappe/desk/form/meta.py b/frappe/desk/form/meta.py
index 40497030a9..88b0b368ef 100644
--- a/frappe/desk/form/meta.py
+++ b/frappe/desk/form/meta.py
@@ -8,7 +8,7 @@ from frappe.build import scrub_html_template
from frappe.model.meta import Meta
from frappe.model.utils import render_include
from frappe.modules import get_module_path, load_doctype_module, scrub
-from frappe.utils import get_html_format
+from frappe.utils import get_bench_path, get_html_format
from frappe.utils.data import get_link_to_form
ASSET_KEYS = (
@@ -120,7 +120,9 @@ class FormMeta(Meta):
def _add_code(self, path, fieldname):
js = get_js(path)
if js:
- comment = f"\n\n/* Adding {path} */\n\n"
+ bench_path = get_bench_path() + "/"
+ asset_path = path.replace(bench_path, "")
+ comment = f"\n\n/* Adding {asset_path} */\n\n"
sourceURL = f"\n\n//# sourceURL={scrub(self.name) + fieldname}"
self.set(fieldname, (self.get(fieldname) or "") + comment + js + sourceURL)
diff --git a/frappe/desk/page/setup_wizard/setup_wizard.js b/frappe/desk/page/setup_wizard/setup_wizard.js
index 75865f6ae4..44960915b1 100644
--- a/frappe/desk/page/setup_wizard/setup_wizard.js
+++ b/frappe/desk/page/setup_wizard/setup_wizard.js
@@ -350,7 +350,7 @@ frappe.setup.SetupWizardSlide = class SetupWizardSlide extends frappe.ui.Slide {
let me = this;
this.fields.filter(frappe.model.is_value_type).forEach((field) => {
field.fieldname &&
- me.get_input(field.fieldname)?.on("change", function () {
+ me.get_input(field.fieldname)?.on?.("change", function () {
frappe.telemetry.capture(`${field.fieldname}_set`, "setup");
if (
field.fieldname == "enable_telemetry" &&
diff --git a/frappe/desk/page/setup_wizard/setup_wizard.py b/frappe/desk/page/setup_wizard/setup_wizard.py
index dbad6f718d..22aa4245d8 100755
--- a/frappe/desk/page/setup_wizard/setup_wizard.py
+++ b/frappe/desk/page/setup_wizard/setup_wizard.py
@@ -157,7 +157,7 @@ def get_setup_complete_hooks(args):
def handle_setup_exception(args):
frappe.db.rollback()
if args:
- traceback = frappe.get_traceback()
+ traceback = frappe.get_traceback(with_context=True)
print(traceback)
for hook in frappe.get_hooks("setup_wizard_exception"):
frappe.get_attr(hook)(traceback, args)
diff --git a/frappe/desk/treeview.py b/frappe/desk/treeview.py
index dcce6f3850..b74582edc8 100644
--- a/frappe/desk/treeview.py
+++ b/frappe/desk/treeview.py
@@ -36,13 +36,17 @@ def get_all_nodes(doctype, label, parent, tree_method, **filters):
@frappe.whitelist()
-def get_children(doctype, parent="", **filters):
- return _get_children(doctype, parent)
+def get_children(doctype, parent="", include_disabled=False, **filters):
+ if isinstance(include_disabled, str):
+ include_disabled = frappe.sbool(include_disabled)
+ return _get_children(doctype, parent, include_disabled=include_disabled)
-def _get_children(doctype, parent="", ignore_permissions=False):
+def _get_children(doctype, parent="", ignore_permissions=False, include_disabled=False):
parent_field = "parent_" + doctype.lower().replace(" ", "_")
filters = [[f"ifnull(`{parent_field}`,'')", "=", parent], ["docstatus", "<", 2]]
+ if frappe.db.has_column(doctype, "disabled") and not include_disabled:
+ filters.append(["disabled", "=", False])
meta = frappe.get_meta(doctype)
diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py
index 2f4c23eac6..0fa328b42d 100755
--- a/frappe/email/doctype/email_account/email_account.py
+++ b/frappe/email/doctype/email_account/email_account.py
@@ -268,15 +268,15 @@ class EmailAccount(Document):
if not in_receive and self.use_imap:
email_server.imap.logout()
- # reset failed attempts count
- self.set_failed_attempts_count(0)
-
return email_server
def check_email_server_connection(self, email_server, in_receive):
# tries to connect to email server and handles failure
try:
email_server.connect()
+
+ # reset failed attempts count - do it after succesful connection
+ self.set_failed_attempts_count(0)
except (error_proto, imaplib.IMAP4.error) as e:
message = cstr(e).lower().replace(" ", "")
auth_error_codes = [
@@ -294,6 +294,8 @@ class EmailAccount(Document):
error_message = _(
"Authentication failed while receiving emails from Email Account: {0}."
).format(self.name)
+
+ error_message = _("Email Account Disabled.") + " " + error_message
error_message += "
" + _("Message from server: {0}").format(cstr(e))
self.handle_incoming_connect_error(description=error_message)
return None
@@ -489,31 +491,35 @@ class EmailAccount(Document):
state.pop("_smtp_server_instance", None)
def handle_incoming_connect_error(self, description):
- if self.get_failed_attempts_count() > 2:
- self.db_set("enable_incoming", 0)
-
- for user in get_system_managers(only_name=True):
- try:
- assign_to.add(
- {
- "assign_to": user,
- "doctype": self.doctype,
- "name": self.name,
- "description": description,
- "priority": "High",
- "notify": 1,
- }
- )
- except assign_to.DuplicateToDoError:
- frappe.clear_last_message()
+ if self.get_failed_attempts_count() > 5:
+ # This is done in background to avoid committing here.
+ frappe.enqueue(self._disable_broken_incoming_account, description=description)
else:
self.set_failed_attempts_count(self.get_failed_attempts_count() + 1)
+ def _disable_broken_incoming_account(self, description):
+ self.db_set("enable_incoming", 0)
+
+ for user in get_system_managers(only_name=True):
+ try:
+ assign_to.add(
+ {
+ "assign_to": [user],
+ "doctype": self.doctype,
+ "name": self.name,
+ "description": description,
+ "priority": "High",
+ "notify": 1,
+ }
+ )
+ except assign_to.DuplicateToDoError:
+ pass
+
def set_failed_attempts_count(self, value):
- frappe.cache.set(f"{self.name}:email-account-failed-attempts", value)
+ frappe.cache.set_value(f"{self.name}:email-account-failed-attempts", value)
def get_failed_attempts_count(self):
- return cint(frappe.cache.get(f"{self.name}:email-account-failed-attempts"))
+ return cint(frappe.cache.get_value(f"{self.name}:email-account-failed-attempts"))
def receive(self):
"""Called by scheduler to receive emails from this EMail account using POP3/IMAP."""
diff --git a/frappe/email/doctype/newsletter/newsletter.js b/frappe/email/doctype/newsletter/newsletter.js
index 5b1a831759..385b31dfab 100644
--- a/frappe/email/doctype/newsletter/newsletter.js
+++ b/frappe/email/doctype/newsletter/newsletter.js
@@ -4,7 +4,7 @@
frappe.ui.form.on("Newsletter", {
refresh(frm) {
let doc = frm.doc;
- let can_write = in_list(frappe.boot.user.can_write, doc.doctype);
+ let can_write = frappe.boot.user.can_write.includes(doc.doctype);
if (!frm.is_new() && !frm.is_dirty() && !doc.email_sent && can_write) {
frm.add_custom_button(
__("Send a test email"),
diff --git a/frappe/email/doctype/newsletter/newsletter.json b/frappe/email/doctype/newsletter/newsletter.json
index 7ac6203ada..e7c902697f 100644
--- a/frappe/email/doctype/newsletter/newsletter.json
+++ b/frappe/email/doctype/newsletter/newsletter.json
@@ -1,5 +1,6 @@
{
"actions": [],
+ "allow_guest_to_view": 1,
"allow_rename": 1,
"creation": "2013-01-10 16:34:31",
"description": "Create and Send Newsletters",
@@ -253,7 +254,7 @@
"index_web_pages_for_search": 1,
"is_published_field": "published",
"links": [],
- "modified": "2023-03-20 22:45:59.129630",
+ "modified": "2023-12-29 18:04:13.270523",
"modified_by": "Administrator",
"module": "Email",
"name": "Newsletter",
diff --git a/frappe/email/doctype/notification/notification.js b/frappe/email/doctype/notification/notification.js
index 5be70b14b0..127f803110 100644
--- a/frappe/email/doctype/notification/notification.js
+++ b/frappe/email/doctype/notification/notification.js
@@ -34,7 +34,7 @@ frappe.notification = {
let fields = frappe.get_doc("DocType", frm.doc.document_type).fields;
let options = $.map(fields, function (d) {
- return in_list(frappe.model.no_value_type, d.fieldtype)
+ return frappe.model.no_value_type.includes(d.fieldtype)
? null
: get_select_options(d);
});
@@ -66,7 +66,7 @@ frappe.notification = {
: null;
}
});
- } else if (in_list(["WhatsApp", "SMS"], frm.doc.channel)) {
+ } else if (["WhatsApp", "SMS"].includes(frm.doc.channel)) {
receiver_fields = $.map(fields, function (d) {
return d.options == "Phone" ? get_select_options(d) : null;
});
@@ -102,7 +102,7 @@ Last comment: {{ comments[-1].comment }} by {{ comments[-1].by }}
</ul>
`;
- } else if (in_list(["Slack", "System Notification", "SMS"], frm.doc.channel)) {
+ } else if (["Slack", "System Notification", "SMS"].includes(frm.doc.channel)) {
template = `
Message Example
*Order Overdue*
@@ -166,7 +166,7 @@ frappe.ui.form.on("Notification", {
frappe.set_route("Form", "Customize Form");
},
event: function (frm) {
- if (in_list(["Days Before", "Days After"], frm.doc.event)) {
+ if (["Days Before", "Days After"].includes(frm.doc.event)) {
frm.add_custom_button(__("Get Alerts for Today"), function () {
frappe.call({
method: "frappe.email.doctype.notification.notification.get_documents_for_today",
diff --git a/frappe/email/doctype/notification/notification.py b/frappe/email/doctype/notification/notification.py
index d89a2bbfbd..28a45ce35e 100644
--- a/frappe/email/doctype/notification/notification.py
+++ b/frappe/email/doctype/notification/notification.py
@@ -366,7 +366,9 @@ def get_context(context):
# For sending messages to specified role
if recipient.receiver_by_role:
- receiver_list += get_info_based_on_role(recipient.receiver_by_role, "mobile_no")
+ receiver_list += get_info_based_on_role(
+ recipient.receiver_by_role, "mobile_no", ignore_permissions=True
+ )
return receiver_list
@@ -505,8 +507,7 @@ def evaluate_alert(doc: Document, alert, event):
frappe.throw(message, title=_("Error in Notification"))
except Exception as e:
title = str(e)
- message = frappe.get_traceback()
- frappe.log_error(message=message, title=title)
+ frappe.log_error(title=title)
msg = f"{title}
{message}
").join(frappe.flags.get("has_permission_check_logs", [])))
- frappe.flags.pop("has_permission_check_logs", None)
+
+ if raise_exception:
+ frappe.flags.pop("has_permission_check_logs", None)
return result
return inner
+def _debug_log(log: str):
+ if not hasattr(frappe.local, "permission_debug_log"):
+ frappe.local.permission_debug_log = []
+ frappe.local.permission_debug_log.append(log)
+
+
+def _pop_debug_log() -> list[str]:
+ if log := getattr(frappe.local, "permission_debug_log", None):
+ del frappe.local.permission_debug_log
+ return log
+ return []
+
+
@print_has_permission_check_logs
def has_permission(
doctype,
@@ -62,7 +82,8 @@ def has_permission(
raise_exception=True,
*,
parent_doctype=None,
-):
+ debug=False,
+) -> bool:
"""Return True if user has permission `ptype` for given `doctype`.
If `doc` is passed, also check user, share and owner permissions.
@@ -83,9 +104,13 @@ def has_permission(
user = frappe.session.user
if user == "Administrator":
+ debug and _debug_log("Allowed everything because user is Administrator")
return True
if ptype == "share" and frappe.get_system_settings("disable_document_sharing"):
+ debug and _debug_log(
+ "User can't share because sharing is disabled globally from system settings"
+ )
return False
if not doc and hasattr(doctype, "doctype"):
@@ -94,88 +119,105 @@ def has_permission(
doctype = doc.doctype
if frappe.is_table(doctype):
- return has_child_permission(doctype, ptype, doc, user, raise_exception, parent_doctype)
+ return has_child_permission(
+ doctype, ptype, doc, user, raise_exception, parent_doctype, debug=debug
+ )
meta = frappe.get_meta(doctype)
if doc:
if isinstance(doc, (str, int)):
doc = frappe.get_doc(meta.name, doc)
- perm = get_doc_permissions(doc, user=user, ptype=ptype).get(ptype)
+ perm = get_doc_permissions(doc, user=user, ptype=ptype, debug=debug).get(ptype)
if not perm:
+ debug and _debug_log(
+ "Permission check failed from role permission system. Check if user's role grant them permission to the document."
+ )
msg = _("User {0} does not have access to this document").format(frappe.bold(user))
if frappe.has_permission(doc.doctype):
msg += f": {_(doc.doctype)} - {doc.name}"
- push_perm_check_log(msg)
+ push_perm_check_log(msg, debug=debug)
else:
if ptype == "submit" and not cint(meta.is_submittable):
- push_perm_check_log(_("Document Type is not submittable"))
+ push_perm_check_log(_("Document Type is not submittable"), debug=debug)
return False
if ptype == "import" and not cint(meta.allow_import):
- push_perm_check_log(_("Document Type is not importable"))
+ push_perm_check_log(_("Document Type is not importable"), debug=debug)
return False
- role_permissions = get_role_permissions(meta, user=user)
+ role_permissions = get_role_permissions(meta, user=user, debug=debug)
+ debug and _debug_log(
+ "User has following permissions using role permission system: "
+ + frappe.as_json(role_permissions, indent=8)
+ )
+
perm = role_permissions.get(ptype)
if not perm:
push_perm_check_log(
_("User {0} does not have doctype access via role permission for document {1}").format(
frappe.bold(user), frappe.bold(doctype)
- )
+ ),
+ debug=debug,
)
def false_if_not_shared():
- if ptype in ("read", "write", "share", "submit", "email", "print"):
+ if ptype not in ("read", "write", "share", "submit", "email", "print"):
+ debug and _debug_log(f"Permission type {ptype} can not be shared")
+ return False
- rights = ["read" if ptype in ("email", "print") else ptype]
+ rights = ["read" if ptype in ("email", "print") else ptype]
- if doc:
- doc_name = get_doc_name(doc)
- shared = frappe.share.get_shared(
- doctype,
- user,
- rights=rights,
- filters=[["share_name", "=", doc_name]],
- limit=1,
- )
+ if doc:
+ doc_name = get_doc_name(doc)
+ shared = frappe.share.get_shared(
+ doctype,
+ user,
+ rights=rights,
+ filters=[["share_name", "=", doc_name]],
+ limit=1,
+ )
+ debug and _debug_log(f"Document is shared with user for {ptype}? {bool(shared)}")
+ return bool(shared)
- if shared:
- if ptype in ("read", "write", "share", "submit") or meta.permissions[0].get(ptype):
- return True
-
- elif frappe.share.get_shared(doctype, user, rights=rights, limit=1):
- # if atleast one shared doc of that type, then return True
- # this is used in db_query to check if permission on DocType
- return True
+ elif frappe.share.get_shared(doctype, user, rights=rights, limit=1):
+ # if atleast one shared doc of that type, then return True
+ # this is used in db_query to check if permission on DocType
+ debug and _debug_log(f"At least one document is shared with user with perm: {rights}")
+ return True
return False
if not perm:
+ debug and _debug_log("Checking if document/doctype is explicitly shared with user")
perm = false_if_not_shared()
return bool(perm)
-def get_doc_permissions(doc, user=None, ptype=None):
+def get_doc_permissions(doc, user=None, ptype=None, debug=False):
"""Return a dict of evaluated permissions for given `doc` like `{"read":1, "write":1}`"""
if not user:
user = frappe.session.user
- if frappe.is_table(doc.doctype):
- return {"read": 1, "write": 1}
-
meta = frappe.get_meta(doc.doctype)
def is_user_owner():
return (doc.get("owner") or "").lower() == user.lower()
- if has_controller_permissions(doc, ptype, user=user) is False:
- push_perm_check_log(_("Not allowed via controller permission check"))
+ if not has_controller_permissions(doc, ptype, user=user, debug=debug):
+ push_perm_check_log(_("Not allowed via controller permission check"), debug=debug)
return {ptype: 0}
- permissions = copy.deepcopy(get_role_permissions(meta, user=user, is_owner=is_user_owner()))
+ permissions = copy.deepcopy(
+ get_role_permissions(meta, user=user, is_owner=is_user_owner(), debug=debug)
+ )
+
+ debug and _debug_log(
+ "User has following permissions using role permission system: "
+ + frappe.as_json(permissions, indent=8)
+ )
if not cint(meta.is_submittable):
permissions["submit"] = 0
@@ -189,20 +231,29 @@ def get_doc_permissions(doc, user=None, ptype=None):
# some access might be only for the owner
# eg. everyone might have read access but only owner can delete
permissions.update(permissions.get("if_owner", {}))
+ debug and _debug_log(
+ "User is owner of document, so permissions are updated to: " + frappe.as_json(permissions)
+ )
- if not has_user_permission(doc, user):
+ if not has_user_permission(doc, user, debug=debug):
if is_user_owner():
# replace with owner permissions
permissions = permissions.get("if_owner", {})
# if_owner does not come with create rights...
permissions["create"] = 0
+ debug and _debug_log("User has only 'If owner' permissions because of User Permissions")
else:
+ debug and _debug_log("User has no permissions because of User Permissions")
permissions = {}
+ debug and _debug_log(
+ "Final applicable permissions after evaluating user permissions: "
+ + frappe.as_json(permissions, indent=8)
+ )
return permissions
-def get_role_permissions(doctype_meta, user=None, is_owner=None):
+def get_role_permissions(doctype_meta, user=None, is_owner=None, debug=False):
"""
Return dict of evaluated role permissions like:
{
@@ -225,12 +276,14 @@ def get_role_permissions(doctype_meta, user=None, is_owner=None):
cache_key = (doctype_meta.name, user, bool(is_owner))
if user == "Administrator":
+ debug and _debug_log("all permissions granted because user is Administrator")
return allow_everything()
- if not frappe.local.role_permissions.get(cache_key):
+ if not frappe.local.role_permissions.get(cache_key) or debug:
perms = frappe._dict(if_owner={})
roles = frappe.get_roles(user)
+ debug and _debug_log("User has following roles: " + str(roles))
def is_perm_applicable(perm):
return perm.role in roles and cint(perm.permlevel) == 0
@@ -271,7 +324,7 @@ def get_user_permissions(user):
return get_user_permissions(user)
-def has_user_permission(doc, user=None):
+def has_user_permission(doc, user=None, debug=False):
"""Return True if User is allowed to view considering User Permissions."""
from frappe.core.doctype.user_permission.user_permission import get_user_permissions
@@ -279,13 +332,17 @@ def has_user_permission(doc, user=None):
if not user_permissions:
# no user permission rules specified for this doctype
+ debug and _debug_log("User is not affected by any user permissions")
return True
# user can create own role permissions, so nothing applies
if get_role_permissions("User Permission", user=user).get("write"):
+ debug and _debug_log("User permission bypassed because user can modify user permissions.")
return True
apply_strict_user_permissions = frappe.get_system_settings("apply_strict_user_permissions")
+ if apply_strict_user_permissions:
+ debug and _debug_log("Strict user permissions will be applied")
doctype = doc.get("doctype")
docname = doc.get("name")
@@ -300,8 +357,14 @@ def has_user_permission(doc, user=None):
# only check if allowed_docs is not empty
if allowed_docs and docname not in allowed_docs:
# no user permissions for this doc specified
- push_perm_check_log(_("Not allowed for {0}: {1}").format(_(doctype), docname))
+ debug and _debug_log(
+ "User doesn't have access to this document because of User Permissions, allowed documents: "
+ + str(allowed_docs)
+ )
+ push_perm_check_log(_("Not allowed for {0}: {1}").format(_(doctype), docname), debug=debug)
return False
+ else:
+ debug and _debug_log(f"User Has access to {docname} via User Permissions.")
# STEP 2: ---------------------------------
# check user permissions in all link fields
@@ -357,7 +420,7 @@ def has_user_permission(doc, user=None):
_(field.label) if field.label else field.fieldname,
)
- push_perm_check_log(msg)
+ push_perm_check_log(msg, debug=debug)
return False
@@ -373,23 +436,27 @@ def has_user_permission(doc, user=None):
return True
-def has_controller_permissions(doc, ptype, user=None):
- """Return controller permissions if defined, None if not defined."""
+def has_controller_permissions(doc, ptype, user=None, debug=False) -> bool:
+ """Return controller permissions if denied, True if not defined.
+
+ Controllers can only deny permission, they can not explicitly grant any permission that wasn't
+ already present."""
if not user:
user = frappe.session.user
methods = frappe.get_hooks("has_permission").get(doc.doctype, [])
if not methods:
- return None
+ return True
for method in reversed(methods):
- controller_permission = frappe.call(frappe.get_attr(method), doc=doc, ptype=ptype, user=user)
+ controller_permission = frappe.call(method, doc=doc, ptype=ptype, user=user, debug=debug)
+ debug and _debug_log(f"Controller permission check from {method}: {controller_permission}")
if controller_permission is not None:
- return controller_permission
+ return bool(controller_permission)
- # controller permissions could not decide on True or False
- return None
+ # None of the controller hooks returned anything conclusive
+ return True
def get_doctypes_with_read():
@@ -678,7 +745,8 @@ def filter_allowed_docs_for_doctype(user_permissions, doctype, with_default_doc=
return (allowed_doc, default_doc) if with_default_doc else allowed_doc
-def push_perm_check_log(log):
+def push_perm_check_log(log, debug=False):
+ debug and _debug_log(log)
if frappe.flags.get("has_permission_check_logs") is None:
return
@@ -692,7 +760,10 @@ def has_child_permission(
user=None,
raise_exception=True,
parent_doctype=None,
-):
+ *,
+ debug=False,
+) -> bool:
+ debug and _debug_log("This doctype is a child table, permissions will be checked on parent.")
if isinstance(child_doc, str):
child_doc = frappe.db.get_value(
child_doctype,
@@ -706,7 +777,8 @@ def has_child_permission(
if not parent_doctype:
push_perm_check_log(
- _("Please specify a valid parent DocType for {0}").format(frappe.bold(child_doctype))
+ _("Please specify a valid parent DocType for {0}").format(frappe.bold(child_doctype)),
+ debug=debug,
)
return False
@@ -720,7 +792,8 @@ def has_child_permission(
push_perm_check_log(
_("{0} is not a valid parent DocType for {1}").format(
frappe.bold(parent_doctype), frappe.bold(child_doctype)
- )
+ ),
+ debug=debug,
)
return False
@@ -730,7 +803,8 @@ def has_child_permission(
push_perm_check_log(
_("Parentfield not specified in {0}: {1}").format(
frappe.bold(child_doctype), frappe.bold(child_doc.name)
- )
+ ),
+ debug=debug,
)
return False
@@ -738,14 +812,19 @@ def has_child_permission(
push_perm_check_log(
_("{0} is not a valid parentfield for {1}").format(
frappe.bold(parentfield), frappe.bold(child_doctype)
- )
+ ),
+ debug=debug,
)
return False
permlevel = parent_meta.get_field(parentfield).permlevel
- if permlevel > 0 and permlevel not in parent_meta.get_permlevel_access(ptype, user=user):
+ accessible_permlevels = parent_meta.get_permlevel_access(ptype, user=user)
+ if permlevel > 0 and permlevel not in accessible_permlevels:
push_perm_check_log(
- _("Insufficient Permission Level for {0}").format(frappe.bold(parent_doctype))
+ _("Insufficient Permission Level for {0}").format(frappe.bold(parent_doctype)), debug=debug
+ )
+ debug and _debug_log(
+ f"This table is perm level {permlevel} but user only has access to {accessible_permlevels}"
)
return False
@@ -755,6 +834,7 @@ def has_child_permission(
doc=child_doc and getattr(child_doc, "parent_doc", child_doc.parent),
user=user,
raise_exception=raise_exception,
+ debug=debug,
)
diff --git a/frappe/printing/doctype/print_format/print_format.js b/frappe/printing/doctype/print_format/print_format.js
index 64cd36a727..cb9bd28570 100644
--- a/frappe/printing/doctype/print_format/print_format.js
+++ b/frappe/printing/doctype/print_format/print_format.js
@@ -79,7 +79,7 @@ frappe.ui.form.on("Print Format", {
frappe.model.with_doctype(doctype, () => {
const meta = frappe.get_meta(doctype);
const has_int_float_currency_field = meta.fields.filter((df) =>
- in_list(["Int", "Float", "Currency"], df.fieldtype)
+ ["Int", "Float", "Currency"].includes(df.fieldtype)
);
frm.toggle_display("absolute_value", has_int_float_currency_field.length);
});
diff --git a/frappe/printing/page/print_format_builder/print_format_builder.js b/frappe/printing/page/print_format_builder/print_format_builder.js
index 46313ef992..5b70f8e2ff 100644
--- a/frappe/printing/page/print_format_builder/print_format_builder.js
+++ b/frappe/printing/page/print_format_builder/print_format_builder.js
@@ -280,7 +280,7 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder {
set_section(f.label);
} else if (f.fieldtype === "Column Break") {
set_column();
- } else if (!in_list(frappe.model.layout_fields, f.fieldtype)) {
+ } else if (!frappe.model.layout_fields.includes(f.fieldtype)) {
if (!column) set_column();
if (f.fieldtype === "Table") {
@@ -317,7 +317,7 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder {
f.visible_columns = [];
$.each(frappe.get_meta(f.options).fields, function (i, _f) {
if (
- !in_list(["Section Break", "Column Break", "Tab Break"], _f.fieldtype) &&
+ !["Section Break", "Column Break", "Tab Break"].includes(_f.fieldtype) &&
!_f.print_hide &&
f.label
) {
@@ -636,7 +636,7 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder {
// add field which are in column_names first to preserve order
var fields = [];
$.each(column_names, function (i, v) {
- if (in_list(Object.keys(docfields_by_name), v)) {
+ if (Object.keys(docfields_by_name).includes(v)) {
fields.push(docfields_by_name[v]);
}
});
@@ -644,8 +644,8 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder {
$.each(doc_fields, function (j, f) {
if (
f &&
- !in_list(column_names, f.fieldname) &&
- !in_list(["Section Break", "Column Break", "Tab Break"], f.fieldtype) &&
+ !column_names.includes(f.fieldname) &&
+ !["Section Break", "Column Break", "Tab Break"].includes(f.fieldtype) &&
f.label
) {
fields.push(f);
diff --git a/frappe/public/js/form_builder/store.js b/frappe/public/js/form_builder/store.js
index 97aa89b58c..91afafa707 100644
--- a/frappe/public/js/form_builder/store.js
+++ b/frappe/public/js/form_builder/store.js
@@ -171,7 +171,7 @@ export const useStore = defineStore("form-builder-store", () => {
}
// Link & Table fields should always have options set
- if (in_list(["Link", ...frappe.model.table_fields], df.fieldtype) && !df.options) {
+ if (["Link", ...frappe.model.table_fields].includes(df.fieldtype) && !df.options) {
error_message = __(
"Options is required for field {0} of type {1}",
get_field_data(df)
@@ -187,7 +187,7 @@ export const useStore = defineStore("form-builder-store", () => {
}
// In List View is not allowed for some fieldtypes
- if (df.in_list_view && in_list(not_allowed_in_list_view, df.fieldtype)) {
+ if (df.in_list_view && not_allowed_in_list_view.includes(df.fieldtype)) {
error_message = __(
"'In List View' is not allowed for field {0} of type {1}",
get_field_data(df)
@@ -195,7 +195,7 @@ export const useStore = defineStore("form-builder-store", () => {
}
// In Global Search is not allowed for no_value_type fields
- if (df.in_global_search && in_list(frappe.model.no_value_type, df.fieldtype)) {
+ if (df.in_global_search && frappe.model.no_value_type.includes(df.fieldtype)) {
error_message = __(
"'In Global Search' is not allowed for field {0} of type {1}",
get_field_data(df)
diff --git a/frappe/public/js/form_builder/utils.js b/frappe/public/js/form_builder/utils.js
index 6856432c2a..838b934a80 100644
--- a/frappe/public/js/form_builder/utils.js
+++ b/frappe/public/js/form_builder/utils.js
@@ -119,7 +119,7 @@ export async function get_table_columns(df, child_doctype) {
1,
]);
for (let tf of table_fields) {
- if (!in_list(frappe.model.layout_fields, tf.fieldtype) && tf.in_list_view && tf.label) {
+ if (!frappe.model.layout_fields.includes(tf.fieldtype) && tf.in_list_view && tf.label) {
let colsize;
if (tf.columns) {
@@ -281,7 +281,7 @@ export function scrub_field_names(fields) {
if (d.fieldname.endsWith("?")) {
d.fieldname = d.fieldname.slice(0, -1);
}
- if (in_list(frappe.model.restricted_fields, d.fieldname)) {
+ if (frappe.model.restricted_fields.includes(d.fieldname)) {
d.fieldname = d.fieldname + "1";
}
if (d.fieldtype == "Section Break") {
@@ -298,7 +298,7 @@ export function scrub_field_names(fields) {
frappe.utils.get_random(4);
}
} else {
- if (in_list(frappe.model.restricted_fields, d.fieldname)) {
+ if (frappe.model.restricted_fields.includes(d.fieldname)) {
frappe.throw(__("Fieldname {0} is restricted", [d.fieldname]));
}
}
diff --git a/frappe/public/js/frappe/file_uploader/FileUploader.vue b/frappe/public/js/frappe/file_uploader/FileUploader.vue
index b4725da83d..5bfcab8148 100644
--- a/frappe/public/js/frappe/file_uploader/FileUploader.vue
+++ b/frappe/public/js/frappe/file_uploader/FileUploader.vue
@@ -473,7 +473,7 @@ function check_restrictions(file) {
return is_correct_type && valid_file_size;
}
-function upload_files() {
+function upload_files(dialog) {
if (show_file_browser.value) {
return upload_via_file_browser();
}
@@ -483,6 +483,14 @@ function upload_files() {
if (props.as_dataurl) {
return return_as_dataurl();
}
+ if (!files.value.length) {
+ frappe.msgprint(__("Please select a file first."));
+ return Promise.reject();
+ }
+
+ dialog?.get_primary_btn().prop("disabled", true);
+ dialog?.get_secondary_btn().prop("disabled", true);
+
return frappe.run_serially(files.value.map((file, i) => () => upload_file(file, i)));
}
function upload_via_file_browser() {
diff --git a/frappe/public/js/frappe/file_uploader/file_uploader.bundle.js b/frappe/public/js/frappe/file_uploader/file_uploader.bundle.js
index 0e63eef469..b886c7703d 100644
--- a/frappe/public/js/frappe/file_uploader/file_uploader.bundle.js
+++ b/frappe/public/js/frappe/file_uploader/file_uploader.bundle.js
@@ -113,9 +113,7 @@ class FileUploader {
}
upload_files() {
- this.dialog && this.dialog.get_primary_btn().prop("disabled", true);
- this.dialog && this.dialog.get_secondary_btn().prop("disabled", true);
- return this.uploader.upload_files();
+ return this.uploader.upload_files(this.dialog);
}
make_dialog(title) {
diff --git a/frappe/public/js/frappe/form/controls/autocomplete.js b/frappe/public/js/frappe/form/controls/autocomplete.js
index 825cfb5320..b7bf5687d6 100644
--- a/frappe/public/js/frappe/form/controls/autocomplete.js
+++ b/frappe/public/js/frappe/form/controls/autocomplete.js
@@ -85,33 +85,15 @@ frappe.ui.form.ControlAutocomplete = class ControlAutoComplete extends frappe.ui
};
}
- init_option_cache() {
- if (!this.$input.cache) {
- this.$input.cache = {};
- }
- if (!this.$input.cache[this.doctype]) {
- this.$input.cache[this.doctype] = {};
- }
- if (!this.$input.cache[this.doctype][this.df.fieldname]) {
- this.$input.cache[this.doctype][this.df.fieldname] = {};
- }
- }
-
setup_awesomplete() {
this.awesomplete = new Awesomplete(this.input, this.get_awesomplete_settings());
$(this.input_area).find(".awesomplete ul").css("min-width", "100%");
- this.init_option_cache();
-
this.$input.on(
"input",
frappe.utils.debounce((e) => {
- const cached_options =
- this.$input.cache[this.doctype][this.df.fieldname][e.target.value];
- if (cached_options && cached_options.length) {
- this.set_data(cached_options);
- } else if (this.get_query || this.df.get_query) {
+ if (this.get_query || this.df.get_query) {
this.execute_query_if_exists(e.target.value);
} else {
this.awesomplete.list = this.get_data();
@@ -245,7 +227,6 @@ frappe.ui.form.ControlAutocomplete = class ControlAutoComplete extends frappe.ui
if (!this.$input.is(":focus")) {
return;
}
- this.$input.cache[this.doctype][this.df.fieldname][term] = message;
this.set_data(message);
},
});
diff --git a/frappe/public/js/frappe/form/controls/base_control.js b/frappe/public/js/frappe/form/controls/base_control.js
index 88669744fa..88aceb56a3 100644
--- a/frappe/public/js/frappe/form/controls/base_control.js
+++ b/frappe/public/js/frappe/form/controls/base_control.js
@@ -87,7 +87,7 @@ frappe.ui.form.Control = class BaseControl {
if (
status === "Read" &&
is_null(value) &&
- !in_list(["HTML", "Image", "Button"], this.df.fieldtype)
+ !["HTML", "Image", "Button"].includes(this.df.fieldtype)
)
status = "Read";
@@ -115,7 +115,7 @@ frappe.ui.form.Control = class BaseControl {
let value = frappe.model.get_value(this.doctype, this.docname, this.df.fieldname);
- if (in_list(["Date", "Datetime"], this.df.fieldtype) && value) {
+ if (["Date", "Datetime"].includes(this.df.fieldtype) && value) {
value = frappe.datetime.str_to_user(value);
}
@@ -127,7 +127,7 @@ frappe.ui.form.Control = class BaseControl {
status === "Read" &&
!this.only_input &&
is_null(value) &&
- !in_list(["HTML", "Image", "Button", "Geolocation"], this.df.fieldtype)
+ !["HTML", "Image", "Button", "Geolocation"].includes(this.df.fieldtype)
) {
if (explain) console.log("By Hide Read-only, null fields: None");
status = "None";
diff --git a/frappe/public/js/frappe/form/controls/base_input.js b/frappe/public/js/frappe/form/controls/base_input.js
index 5aacc193d1..2e29cc79a9 100644
--- a/frappe/public/js/frappe/form/controls/base_input.js
+++ b/frappe/public/js/frappe/form/controls/base_input.js
@@ -138,7 +138,7 @@ frappe.ui.form.ControlInput = class ControlInput extends frappe.ui.form.Control
set_disp_area(value) {
if (
- in_list(["Currency", "Int", "Float"], this.df.fieldtype) &&
+ ["Currency", "Int", "Float"].includes(this.df.fieldtype) &&
(this.value === 0 || value === 0)
) {
// to set the 0 value in readonly for currency, int, float field
@@ -172,7 +172,7 @@ frappe.ui.form.ControlInput = class ControlInput extends frappe.ui.form.Control
if (
!this.df.label ||
!this.df?.documentation_url ||
- in_list(unsupported_fieldtypes, this.df.fieldtype)
+ unsupported_fieldtypes.includes(this.df.fieldtype)
)
return;
diff --git a/frappe/public/js/frappe/form/controls/code.js b/frappe/public/js/frappe/form/controls/code.js
index db040d7c58..05e8fde29c 100644
--- a/frappe/public/js/frappe/form/controls/code.js
+++ b/frappe/public/js/frappe/form/controls/code.js
@@ -161,6 +161,7 @@ frappe.ui.form.ControlCode = class ControlCode extends frappe.ui.form.ControlTex
Golang: "ace/mode/golang",
Go: "ace/mode/golang",
Jinja: "ace/mode/django",
+ SQL: "ace/mode/sql",
};
const language = this.df.options;
diff --git a/frappe/public/js/frappe/form/controls/data.js b/frappe/public/js/frappe/form/controls/data.js
index 2d0f506917..b090ed3cf2 100644
--- a/frappe/public/js/frappe/form/controls/data.js
+++ b/frappe/public/js/frappe/form/controls/data.js
@@ -215,8 +215,7 @@ frappe.ui.form.ControlData = class ControlData extends frappe.ui.form.ControlInp
}
set_input_attributes() {
if (
- in_list(
- ["Data", "Link", "Dynamic Link", "Password", "Select", "Read Only"],
+ ["Data", "Link", "Dynamic Link", "Password", "Select", "Read Only"].includes(
this.df.fieldtype
)
) {
diff --git a/frappe/public/js/frappe/form/controls/datetime.js b/frappe/public/js/frappe/form/controls/datetime.js
index 5d87c209e9..96f2f885d2 100644
--- a/frappe/public/js/frappe/form/controls/datetime.js
+++ b/frappe/public/js/frappe/form/controls/datetime.js
@@ -16,7 +16,7 @@ frappe.ui.form.ControlDatetime = class ControlDatetime extends frappe.ui.form.Co
}
get_start_date() {
- this.value = this.value == null ? undefined : this.value;
+ this.value = this.value == null || this.value == "" ? undefined : this.value;
let value = frappe.datetime.convert_to_user_tz(this.value);
return frappe.datetime.str_to_obj(value);
}
diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index f60656273f..3125a0ca59 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -87,10 +87,10 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
return this.is_translatable() ? __(value) : value;
}
is_translatable() {
- return in_list(frappe.boot?.translated_doctypes || [], this.get_options());
+ return frappe.boot?.translated_doctypes || [].includes(this.get_options());
}
is_title_link() {
- return in_list(frappe.boot?.link_title_doctypes || [], this.get_options());
+ return frappe.boot?.link_title_doctypes || [].includes(this.get_options());
}
async set_link_title(value) {
const doctype = this.get_options();
diff --git a/frappe/public/js/frappe/form/controls/multicheck.js b/frappe/public/js/frappe/form/controls/multicheck.js
index 4b2987cf45..e29aa0a23e 100644
--- a/frappe/public/js/frappe/form/controls/multicheck.js
+++ b/frappe/public/js/frappe/form/controls/multicheck.js
@@ -75,13 +75,15 @@ frappe.ui.form.ControlMultiCheck = class ControlMultiCheck extends frappe.ui.for
make_checkboxes() {
this.$load_state.hide();
this.$checkbox_area.empty();
- this.options.forEach((option) => {
- let checkbox = this.get_checkbox_element(option).appendTo(this.$checkbox_area);
- if (option.danger) {
- checkbox.find(".label-area").addClass("text-danger");
- }
- option.$checkbox = checkbox;
- });
+ this.options
+ .sort((a, b) => cstr(a.label).localeCompare(cstr(b.label)))
+ .forEach((option) => {
+ let checkbox = this.get_checkbox_element(option).appendTo(this.$checkbox_area);
+ if (option.danger) {
+ checkbox.find(".label-area").addClass("text-danger");
+ }
+ option.$checkbox = checkbox;
+ });
if (this.df.select_all) {
this.setup_select_all();
}
@@ -152,7 +154,7 @@ frappe.ui.form.ControlMultiCheck = class ControlMultiCheck extends frappe.ui.for
`);
diff --git a/frappe/public/js/frappe/form/controls/rating.js b/frappe/public/js/frappe/form/controls/rating.js
index ab2bda7d6d..1ae49c1feb 100644
--- a/frappe/public/js/frappe/form/controls/rating.js
+++ b/frappe/public/js/frappe/form/controls/rating.js
@@ -1,4 +1,4 @@
-frappe.ui.form.ControlRating = class ControlRating extends frappe.ui.form.ControlInt {
+frappe.ui.form.ControlRating = class ControlRating extends frappe.ui.form.ControlFloat {
make_input() {
super.make_input();
let stars = "";
diff --git a/frappe/public/js/frappe/form/controls/table_multiselect.js b/frappe/public/js/frappe/form/controls/table_multiselect.js
index 09bf21c827..50e94651eb 100644
--- a/frappe/public/js/frappe/form/controls/table_multiselect.js
+++ b/frappe/public/js/frappe/form/controls/table_multiselect.js
@@ -166,7 +166,7 @@ frappe.ui.form.ControlTableMultiSelect = class ControlTableMultiSelect extends (
let me = this;
awesomplete.filter = function (item) {
- if (in_list(me._rows_list, item.value)) {
+ if (me._rows_list.includes(item.value)) {
return false;
}
diff --git a/frappe/public/js/frappe/form/footer/form_timeline.js b/frappe/public/js/frappe/form/footer/form_timeline.js
index 98a03eff97..fa7ab49dd1 100644
--- a/frappe/public/js/frappe/form/footer/form_timeline.js
+++ b/frappe/public/js/frappe/form/footer/form_timeline.js
@@ -295,11 +295,11 @@ class FormTimeline extends BaseTimeline {
set_communication_doc_status(doc) {
let indicator_color = "red";
- if (in_list(["Sent", "Clicked"], doc.delivery_status)) {
+ if (["Sent", "Clicked"].includes(doc.delivery_status)) {
indicator_color = "green";
} else if (["Sending", "Scheduled"].includes(doc.delivery_status)) {
indicator_color = "orange";
- } else if (in_list(["Opened", "Read"], doc.delivery_status)) {
+ } else if (["Opened", "Read"].includes(doc.delivery_status)) {
indicator_color = "blue";
} else if (doc.delivery_status == "Error") {
indicator_color = "red";
diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 4f42b3ecaa..410a185ba2 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1412,7 +1412,7 @@ frappe.ui.form.Form = class FrappeForm {
is_form_builder() {
return (
- in_list(["DocType", "Customize Form"], this.doctype) &&
+ ["DocType", "Customize Form"].includes(this.doctype) &&
this.get_active_tab().label == "Form"
);
}
diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index b5942c7f46..8809d7b838 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -158,7 +158,7 @@ export default class Grid {
if (
!this.df.label ||
!this.df?.documentation_url ||
- in_list(unsupported_fieldtypes, this.df.fieldtype)
+ unsupported_fieldtypes.includes(this.df.fieldtype)
)
return;
@@ -685,7 +685,7 @@ export default class Grid {
get_modal_data() {
return this.df.get_data
? this.df.get_data().filter((data) => {
- if (!this.deleted_docs || !in_list(this.deleted_docs, data.name)) {
+ if (!this.deleted_docs || !this.deleted_docs.includes(data.name)) {
return data;
}
})
@@ -940,7 +940,7 @@ export default class Grid {
!df.hidden &&
(this.editable_fields || df.in_list_view) &&
((this.frm && this.frm.get_perm(df.permlevel, "read")) || !this.frm) &&
- !in_list(frappe.model.layout_fields, df.fieldtype)
+ !frappe.model.layout_fields.includes(df.fieldtype)
) {
if (df.columns) {
df.colsize = df.columns;
diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index a168729c66..d403becaeb 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -429,10 +429,10 @@ export default class GridRow {
$(`