From 5d1bc73343abd7f1e29095c7c57644afd60b2e66 Mon Sep 17 00:00:00 2001
From: Dmitry <nerosketch@gmail.com>
Date: Wed, 22 Feb 2017 22:22:53 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D1=84?=
 =?UTF-8?q?=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0=D1=86=D0=B8=D1=8E=20=D0=BF?=
 =?UTF-8?q?=D0=BE=20=D0=BA=D0=BE=D0=BB=D0=BE=D0=BD=D0=BA=D0=B0=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 devapp/templates/devapp/devices.html | 21 ++++++++++++++++++---
 devapp/views.py                      | 14 ++++++++++++--
 2 files changed, 30 insertions(+), 5 deletions(-)

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 @@
         <table class="table table-striped table-bordered">
             <thead>
             <tr>
-                <th>{% trans 'Ip address' %}</th>
-                <th>{% trans 'Comment' %}</th>
-                <th width="250">{% trans 'Device type' %}</th>
+                <th>
+                    <a href="{% url 'devapp:devs' %}?order_by=ip_address&dir={{ dir|default:"down" }}">
+                        {% trans 'Ip address' %}
+                    </a>
+                    {% if order_by == 'ip_address' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
+                </th>
+                <th>
+                    <a href="{% url 'devapp:devs' %}?order_by=comment&dir={{ dir|default:"down" }}">
+                        {% trans 'Comment' %}
+                    </a>
+                    {% if order_by == 'comment' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
+                </th>
+                <th width="250">
+                    <a href="{% url 'devapp:devs' %}?order_by=devtype&dir={{ dir|default:"down" }}">
+                        {% trans 'Device type' %}
+                    </a>
+                    {% if order_by == 'devtype' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
+                </th>
                 <th width="100">Do</th>
             </tr>
             </thead>
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')
     })