diff --git a/devapp/templates/devapp/devices.html b/devapp/templates/devapp/devices.html index 0e6c2eb..79b5e60 100644 --- a/devapp/templates/devapp/devices.html +++ b/devapp/templates/devapp/devices.html @@ -14,9 +14,24 @@ - - - + + + diff --git a/devapp/views.py b/devapp/views.py index 2ec8a10..2124418 100644 --- a/devapp/views.py +++ b/devapp/views.py @@ -7,7 +7,7 @@ from django.utils.translation import ugettext as _ from easysnmp import EasySNMPTimeoutError from .models import Device -from mydefs import pag_mn, res_success, res_error, only_admins, ping +from mydefs import pag_mn, res_success, res_error, only_admins, ping, order_helper from .forms import DeviceForm @@ -15,10 +15,20 @@ from .forms import DeviceForm @only_admins def devices(request): devs = Device.objects.all() + + # фильтр + dr, field = order_helper(request) + if field: + devs = devs.order_by(field) + print(type(request.GET), request.GET) + import django.http.request + devs = pag_mn(request, devs) return render(request, 'devapp/devices.html', { - 'devices': devs + 'devices': devs, + 'dir': dr, + 'order_by': request.GET.get('order_by') })
{% trans 'Ip address' %}{% trans 'Comment' %}{% trans 'Device type' %} + + {% trans 'Ip address' %} + + {% if order_by == 'ip_address' %}{% endif %} + + + {% trans 'Comment' %} + + {% if order_by == 'comment' %}{% endif %} + + + {% trans 'Device type' %} + + {% if order_by == 'devtype' %}{% endif %} + Do