diff options
Diffstat (limited to 'ishtar_common/views.py')
| -rw-r--r-- | ishtar_common/views.py | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index bae1c8464..cc2443f80 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -1011,32 +1011,6 @@ def get_item(model, func_name, default_name, extra_request_keys=[], if not manual_sort_key: items = items.order_by(*orders) - """ - elif q and q in request_keys: - ks = request_keys[q] - if type(ks) not in (list, tuple): - ks = [ks] - orders = [] - for k in ks: - if k.endswith("__pk"): - k = k[:-len("__pk")] + "__label" - if '__' in k: - k = k.split('__')[0] - orders.append(sign + k) - items = items.order_by(*orders) - elif q: - for ke in query_table_cols: - if type(ke) in (list, tuple): - ke = ke[0] - if ke.endswith(q): - manual_sort_key = ke - logger.warning("**WARN get_item - {}**: manual sort key '{" - "}'".format(func_name, q)) - break - if not manual_sort_key and model._meta.ordering: - orders = [sign + k for k in model._meta.ordering] - items = items.order_by(*orders) - """ # pager management start, end = 0, None page_nb = 1 @@ -1187,7 +1161,8 @@ def get_item(model, func_name, default_name, extra_request_keys=[], data = json.dumps(rows) else: data = json.dumps({ - "records": items_nb, + "recordsTotal": items_nb, + "recordsFiltered": items_nb, "rows": rows, "pinned-search": pinned_search, "page": page_nb, @@ -1303,6 +1278,7 @@ def show_item(model, name, extra_dct=None): date = None if 'date' in dct: date = dct.pop('date') + dct['sheet_id'] = "%s-%d" % (name, item.pk) dct['window_id'] = "%s-%d-%s" % ( name, item.pk, datetime.datetime.now().strftime('%M%s')) if hasattr(item, 'history'): |