Merge pull request #671 from anandpdoshi/anand-july-3

Fixed sync_queues
This commit is contained in:
Rushabh Mehta 2014-07-04 10:45:49 +05:30
commit 89a673599d
2 changed files with 5 additions and 1 deletions

View file

@ -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=''):

View file

@ -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