|
|
|
|
@ -148,7 +148,7 @@ class BaseViews(object): |
|
|
|
|
|
|
|
|
|
def get_ordering(self): |
|
|
|
|
"""Поле и порядок сортировки.""" |
|
|
|
|
order_field, order_type = 'doc_num', 'desc' # default |
|
|
|
|
order_field, order_type = 'doc_date', 'desc' # default |
|
|
|
|
params = dict(self.request.GET.items()) |
|
|
|
|
if params.get(ORDER_VAR) in self.ORDER_FIELDS: |
|
|
|
|
order_field = params.get(ORDER_VAR) |
|
|
|
|
@ -163,7 +163,11 @@ class BaseViews(object): |
|
|
|
|
# задать сортировку |
|
|
|
|
order_field, order_type = self.get_ordering() |
|
|
|
|
if order_field: |
|
|
|
|
qs = qs.order_by('%s%s' % ((order_type == 'desc' and '-' or ''), order_field,)) |
|
|
|
|
if order_field == 'doc_date': |
|
|
|
|
order_query = '%s%s' % ((order_type == 'desc' and '-' or ''), order_field,) |
|
|
|
|
qs = qs.order_by(order_query, '-doc_num') |
|
|
|
|
else: |
|
|
|
|
qs = qs.order_by('%s%s' % ((order_type == 'desc' and '-' or ''), order_field,)) |
|
|
|
|
return qs |
|
|
|
|
|
|
|
|
|
def get_filters(self, qs): |
|
|
|
|
|