From beaebe5c9a70c09f1b6505aaad79f79a80021b11 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Wed, 13 Sep 2017 13:18:46 +0530 Subject: [PATCH 1/4] [minor] set list view as selectable to allow bulk assigment --- frappe/public/js/frappe/list/list_renderer.js | 2 ++ frappe/public/js/frappe/list/list_view.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/list/list_renderer.js b/frappe/public/js/frappe/list/list_renderer.js index 27c4bd6b22..b94c222d18 100644 --- a/frappe/public/js/frappe/list/list_renderer.js +++ b/frappe/public/js/frappe/list/list_renderer.js @@ -47,6 +47,8 @@ frappe.views.ListRenderer = Class.extend({ }, init_settings: function () { this.settings = frappe.listview_settings[this.doctype] || {}; + if(!("selectable" in this.settings)) + this.settings.selectable = true; this.init_user_settings(); this.order_by = this.user_settings.order_by || this.settings.order_by; diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 0557adc2ac..d734b3249b 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -777,7 +777,7 @@ frappe.views.ListView = frappe.ui.BaseList.extend({ setup_delete: function () { var me = this; - if (!(this.can_delete || this.list_renderer.settings.selectable)) { + if (!this.can_delete) { return; } this.$page.on('change', '.list-row-checkbox, .list-select-all', function() { From 9ed6c5341e90a2a798796facb92881f1e89c9379 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Wed, 13 Sep 2017 13:22:17 +0530 Subject: [PATCH 2/4] [minor] don't show Bulk Print Option if user don't have Print permission --- frappe/public/js/frappe/list/list_view.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index d734b3249b..f159049931 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -620,7 +620,8 @@ frappe.views.ListView = frappe.ui.BaseList.extend({ } this.make_bulk_assignment(); - this.make_bulk_printing(); + if(frappe.model.can_print(this.doctype)) + this.make_bulk_printing(); // add to desktop this.page.add_menu_item(__('Add to Desktop'), function () { From f6018f7d5dd8476ba1053723b7e36b00d428152c Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Thu, 14 Sep 2017 12:12:53 +0530 Subject: [PATCH 3/4] Update list_renderer.js --- frappe/public/js/frappe/list/list_renderer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/list/list_renderer.js b/frappe/public/js/frappe/list/list_renderer.js index b94c222d18..cd844f6238 100644 --- a/frappe/public/js/frappe/list/list_renderer.js +++ b/frappe/public/js/frappe/list/list_renderer.js @@ -47,8 +47,9 @@ frappe.views.ListRenderer = Class.extend({ }, init_settings: function () { this.settings = frappe.listview_settings[this.doctype] || {}; - if(!("selectable" in this.settings)) + if(!("selectable" in this.settings)) { this.settings.selectable = true; + } this.init_user_settings(); this.order_by = this.user_settings.order_by || this.settings.order_by; From 2fb63b50bc3da9d21a78b0438a1b43895155d984 Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Thu, 14 Sep 2017 12:16:12 +0530 Subject: [PATCH 4/4] Update list_view.js --- frappe/public/js/frappe/list/list_view.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index f159049931..42f2bd3aa2 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -620,8 +620,9 @@ frappe.views.ListView = frappe.ui.BaseList.extend({ } this.make_bulk_assignment(); - if(frappe.model.can_print(this.doctype)) + if(frappe.model.can_print(this.doctype)) { this.make_bulk_printing(); + } // add to desktop this.page.add_menu_item(__('Add to Desktop'), function () {