From 86611be0c6e42e6e9febcd3a98ca6f8af725aade Mon Sep 17 00:00:00 2001 From: 14987 Date: Wed, 18 Oct 2023 19:15:10 +0530 Subject: [PATCH 1/3] fix: Update type of perm level option in permission manager --- frappe/core/page/permission_manager/permission_manager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/page/permission_manager/permission_manager.js b/frappe/core/page/permission_manager/permission_manager.js index f06e583bee..4467ebd0bc 100644 --- a/frappe/core/page/permission_manager/permission_manager.js +++ b/frappe/core/page/permission_manager/permission_manager.js @@ -444,7 +444,7 @@ frappe.PermissionEngine = class PermissionEngine { { fieldtype: "Select", label: __("Permission Level"), - options: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], + options: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"], reqd: 1, fieldname: "permlevel", description: __( From 94459a058d154f3f5fb22f5803bbe8ae5942b0ff Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 19 Oct 2023 13:24:02 +0530 Subject: [PATCH 2/3] fix: set v as value if v is not an object --- frappe/public/js/frappe/form/controls/select.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/select.js b/frappe/public/js/frappe/form/controls/select.js index 53e7f35125..68a76751be 100644 --- a/frappe/public/js/frappe/form/controls/select.js +++ b/frappe/public/js/frappe/form/controls/select.js @@ -161,7 +161,7 @@ function parse_option(v) { is_disabled = Boolean(v.disabled); is_selected = Boolean(v.selected); - if (is_value_null && is_label_null && typeof v === "string") { + if (is_value_null && is_label_null && typeof v !== "object") { value = v; label = __(v); } else { From 72ba005e514169c304b780bce6c9b9eafaa13c24 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 19 Oct 2023 13:25:39 +0530 Subject: [PATCH 3/3] revert: setting options as string --- frappe/core/page/permission_manager/permission_manager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/page/permission_manager/permission_manager.js b/frappe/core/page/permission_manager/permission_manager.js index 4467ebd0bc..f06e583bee 100644 --- a/frappe/core/page/permission_manager/permission_manager.js +++ b/frappe/core/page/permission_manager/permission_manager.js @@ -444,7 +444,7 @@ frappe.PermissionEngine = class PermissionEngine { { fieldtype: "Select", label: __("Permission Level"), - options: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"], + options: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], reqd: 1, fieldname: "permlevel", description: __(