From 9f0721c0df44199f573ab315fe1963f028c63fac Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Mon, 22 Jul 2019 15:12:22 +0530 Subject: [PATCH 1/4] fix: do not check result items --- frappe/public/js/frappe/form/multi_select_dialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js index 0d8d2caca1..9b9ebae98f 100644 --- a/frappe/public/js/frappe/form/multi_select_dialog.js +++ b/frappe/public/js/frappe/form/multi_select_dialog.js @@ -201,7 +201,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({ let $row = $(`
- +
${contents}
`); From 117a745d909090902d49221819cc2d180c9e36ae Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Mon, 22 Jul 2019 15:15:29 +0530 Subject: [PATCH 2/4] fix: remove auto check of multiselect values --- frappe/public/js/frappe/form/multi_select_dialog.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js index 9b9ebae98f..739062fa61 100644 --- a/frappe/public/js/frappe/form/multi_select_dialog.js +++ b/frappe/public/js/frappe/form/multi_select_dialog.js @@ -291,7 +291,6 @@ frappe.ui.form.MultiSelectDialog = Class.extend({ if(me.date_field in result) { result["Date"] = result[me.date_field] } - result.checked = 0; result.parsed_date = Date.parse(result["Date"]); results.push(result); }); From a34519d02eadb58405242b7682e46623af2c9958 Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Mon, 22 Jul 2019 15:24:39 +0530 Subject: [PATCH 3/4] fix: multiselect --- frappe/public/js/frappe/form/multi_select_dialog.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js index 739062fa61..5458e21406 100644 --- a/frappe/public/js/frappe/form/multi_select_dialog.js +++ b/frappe/public/js/frappe/form/multi_select_dialog.js @@ -201,7 +201,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({ let $row = $(`
- +
${contents}
`); @@ -291,6 +291,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({ if(me.date_field in result) { result["Date"] = result[me.date_field] } + result.checked = 0; result.parsed_date = Date.parse(result["Date"]); results.push(result); }); @@ -303,9 +304,9 @@ frappe.ui.form.MultiSelectDialog = Class.extend({ }); // Preselect oldest entry - if (me.start < 1) { - results[0].checked = 1; - } + // if (me.start < 1) { + // results[0].checked = 1; + // } } me.render_result_list(results, more); } From 804903182ac9233bbbfc6d1c117584365d694e51 Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Mon, 22 Jul 2019 16:13:04 +0530 Subject: [PATCH 4/4] fix: auto check only if one value --- frappe/public/js/frappe/form/multi_select_dialog.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js index 5458e21406..d2caa24e43 100644 --- a/frappe/public/js/frappe/form/multi_select_dialog.js +++ b/frappe/public/js/frappe/form/multi_select_dialog.js @@ -304,9 +304,9 @@ frappe.ui.form.MultiSelectDialog = Class.extend({ }); // Preselect oldest entry - // if (me.start < 1) { - // results[0].checked = 1; - // } + if (me.start < 1 && r.values.length === 1) { + results[0].checked = 1; + } } me.render_result_list(results, more); }