Selaa lähdekoodia

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

Fixed sync_queues
version-14
Rushabh Mehta 11 vuotta sitten
vanhempi
commit
89a673599d
2 muutettua tiedostoa jossa 5 lisäystä ja 1 poistoa
  1. +2
    -0
      frappe/tasks.py
  2. +3
    -1
      frappe/widgets/search.py

+ 2
- 0
frappe/tasks.py Näytä tiedosto

@@ -52,6 +52,8 @@ def sync_worker(app, worker, prefix=''):


def get_active_queues(app, worker): def get_active_queues(app, worker):
active_queues = app.control.inspect().active_queues() 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]] return [queue['name'] for queue in active_queues[worker]]


def get_required_queues(app, prefix=''): def get_required_queues(app, prefix=''):


+ 3
- 1
frappe/widgets/search.py Näytä tiedosto

@@ -74,7 +74,9 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0,
frappe.response["values"] = frappe.widgets.reportview.execute(doctype, frappe.response["values"] = frappe.widgets.reportview.execute(doctype,
filters=filters, fields = get_std_fields_list(meta, searchfield or "name"), filters=filters, fields = get_std_fields_list(meta, searchfield or "name"),
or_filters = or_filters, limit_start = start, 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): def get_std_fields_list(meta, key):
# get additional search fields # get additional search fields


Ladataan…
Peruuta
Tallenna