vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix: same result set shwoing multiple times in the multi-select popup

Browse source
This commit is contained in:
Rohit Waghchaure 2019-05-28 20:39:12 +05:30
parent 7788b807e0
commit fa799d5734
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
frappe/public/js/frappe/form/multi_select_dialog.js
View file

@ -59,6 +59,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
{ fieldtype: "Button", fieldname: "more_btn", label: __("More"),
click: function(){
me.start += 20;
frappe.flags.auto_scroll = true;
me.get_results();
}
}
@ -117,10 +118,12 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
});
this.$parent.find('.input-with-feedback').on('change', (e) => {
frappe.flags.auto_scroll = false;
this.get_results();
});
this.$parent.find('[data-fieldname="date_range"]').on('blur', (e) => {
frappe.flags.auto_scroll = false;
this.get_results();
});
@ -128,6 +131,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
var $this = $(this);
clearTimeout($this.data('timeout'));
$this.data('timeout', setTimeout(function() {
frappe.flags.auto_scroll = false;
me.get_results();
}, 300));
});
@ -176,11 +180,17 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
var me = this;
var more_btn = me.dialog.fields_dict.more_btn.$wrapper;
// Make empty result set if filter is set
if (!frappe.flags.auto_scroll) {
this.$results.empty();
}
if(results.length === 0) {
this.$results.empty();
more_btn.hide();
return;
} else {
} else if(more) {
more_btn.show();
}
@ -188,7 +198,9 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
me.$results.append(me.make_list_row(result));
});
this.$results.animate({scrollTop: me.$results.prop('scrollHeight')}, 500);
if (frappe.flags.auto_scroll) {
this.$results.animate({scrollTop: me.$results.prop('scrollHeight')}, 500);
}
},
get_results: function() {