From 65db85d55954781f2e2c32bc069c9b9bfcee7d20 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 15 Aug 2024 14:33:13 +0530 Subject: [PATCH] fix: changed enable edit select option to disable edit checkbox --- .../list_view_settings/list_view_settings.json | 12 ++++++------ .../doctype/list_view_settings/list_view_settings.py | 2 +- frappe/public/js/frappe/list/list_view.js | 7 +++---- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/frappe/desk/doctype/list_view_settings/list_view_settings.json b/frappe/desk/doctype/list_view_settings/list_view_settings.json index 4ef7023ac0..63663477b3 100644 --- a/frappe/desk/doctype/list_view_settings/list_view_settings.json +++ b/frappe/desk/doctype/list_view_settings/list_view_settings.json @@ -10,7 +10,7 @@ "disable_comment_count", "disable_sidebar_stats", "disable_auto_refresh", - "enable_edit", + "disable_edit", "total_fields", "fields_html", "fields" @@ -59,14 +59,14 @@ "label": "Disable Comment Count" }, { - "fieldname": "enable_edit", - "fieldtype": "Select", - "label": "Enable Edit", - "options": "\nYes\nNo" + "default": "0", + "fieldname": "disable_edit", + "fieldtype": "Check", + "label": "Disable Edit" } ], "links": [], - "modified": "2024-08-14 21:11:08.307688", + "modified": "2024-08-15 14:23:18.226666", "modified_by": "Administrator", "module": "Desk", "name": "List View Settings", diff --git a/frappe/desk/doctype/list_view_settings/list_view_settings.py b/frappe/desk/doctype/list_view_settings/list_view_settings.py index f2d7d2c499..4e0bba025f 100644 --- a/frappe/desk/doctype/list_view_settings/list_view_settings.py +++ b/frappe/desk/doctype/list_view_settings/list_view_settings.py @@ -17,8 +17,8 @@ class ListViewSettings(Document): disable_auto_refresh: DF.Check disable_comment_count: DF.Check disable_count: DF.Check + disable_edit: DF.Check disable_sidebar_stats: DF.Check - enable_edit: DF.Literal["", "Yes", "No"] fields: DF.Code | None total_fields: DF.Literal["", "4", "5", "6", "7", "8", "9", "10"] # end: auto-generated types diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 8416dc1ea7..2fa11099a7 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -1898,12 +1898,11 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { const is_bulk_editable = (doctype) => { if ( this.list_view_settings && - this.list_view_settings.enable_edit && - this.list_view_settings.enable_edit!='' + this.list_view_settings.disable_edit!=undefined ) { - return this.list_view_settings.enable_edit=='Yes'?true:false; + return !this.list_view_settings.disable_edit; } - return !frappe.model.has_workflow(doctype); + return !frappe.model.has_workflow(doctype) }; // utility