Merge branch 'develop'

frappe/__init__.py

@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template
 
-__version__ = '8.0.45'
+__version__ = '8.0.46'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/desk/search.py

@@ -101,8 +101,12 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0,
 				as_list=not as_dict)
 
 			# remove _relevance from results
-			frappe.response["fields"] = fields
-			frappe.response["values"] = [r[:-1] for r in values]
+			if as_dict:
+				for r in values:
+					r.pop("_relevance")
+				frappe.response["values"] = values
+			else:
+				frappe.response["values"] = [r[:-1] for r in values]
 
 def get_std_fields_list(meta, key):
 	# get additional search fields

frappe/public/js/frappe/form/multi_select_dialog.js

@@ -169,7 +169,9 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 			txt: '',
 			filters: filters,
 			filter_fields: Object.keys(me.setters).concat([me.date_field]),
-			page_len: null
+			page_len: null,
+			query: this.get_query().query,
+			as_dict: 1
 		}
 		frappe.call({
 			type: "GET",
@@ -177,22 +179,16 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 			no_spinner: true,
 			args: args,
 			callback: function(r) {
-				if(r.values) {
-					let results = [];
-					r.values.forEach(function(value_list) {
-						let result = {};
-						value_list.forEach(function(value, index){
-							if(r.fields[index] === me.date_field) {
-								result["Date"] = value;
-							} else {
-								result[r.fields[index]] = value;
-							}
-						});
+				let results = [];
+				if(r.values.length) {
+					r.values.forEach(function(result) {
+						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);
 					});
-
 					results.map( (result) => {
 						result["Date"] = frappe.format(result["Date"], {"fieldtype":"Date"});
 					})
@@ -203,9 +199,8 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 
 					// Preselect oldest entry
 					results[0].checked = 1
-
-					me.render_result_list(results);
 				}
+				me.render_result_list(results);
 			}
 		});
 	},