From a873d7df4fe23f6b39eb7d0c57ae211dec751333 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 3 Jul 2014 16:49:06 +0530 Subject: [PATCH 1/2] Fixed sync_queues --- frappe/tasks.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/tasks.py b/frappe/tasks.py index 108e00b389..6141eb7711 100644 --- a/frappe/tasks.py +++ b/frappe/tasks.py @@ -52,6 +52,8 @@ def sync_worker(app, worker, prefix=''): def get_active_queues(app, worker): active_queues = app.control.inspect().active_queues() + if not (active_queues and active_queues.get(worker)): + return [] return [queue['name'] for queue in active_queues[worker]] def get_required_queues(app, prefix=''): From 473cc61a72163a3b54a3f076d28d5717ec1ef472 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 3 Jul 2014 17:53:51 +0530 Subject: [PATCH 2/2] Sort search results in autosuggest by name --- frappe/widgets/search.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/widgets/search.py b/frappe/widgets/search.py index 91a89baade..ceb4aea748 100644 --- a/frappe/widgets/search.py +++ b/frappe/widgets/search.py @@ -74,7 +74,9 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0, frappe.response["values"] = frappe.widgets.reportview.execute(doctype, filters=filters, fields = get_std_fields_list(meta, searchfield or "name"), or_filters = or_filters, limit_start = start, - limit_page_length=page_len, as_list=True) + limit_page_length=page_len, + order_by="`tab{}`.name asc".format(doctype), + as_list=True) def get_std_fields_list(meta, key): # get additional search fields