From e5507a16e6338a23c1902570ebd772babc2c3567 Mon Sep 17 00:00:00 2001 From: bashmak Date: Tue, 11 Apr 2017 13:56:14 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=20=D0=BF=D0=BE=20ip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- searchapp/views.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/searchapp/views.py b/searchapp/views.py index 5b2cbd7..5c01d63 100644 --- a/searchapp/views.py +++ b/searchapp/views.py @@ -4,7 +4,7 @@ from django.db.models import Q from django.shortcuts import render from django.utils.html import escape -from abonapp.models import Abon +from abonapp.models import Abon, IpPoolItem def replace_without_case(orig, old, new): @@ -15,11 +15,11 @@ def home(request): s = request.GET.get('s') if s: - abons = Abon.objects.filter( - Q(fio__icontains=s) | - Q(username__icontains=s) | - Q(telephone__icontains=s) - ) + ips = IpPoolItem.objects.filter(ip=s) + query = Q(fio__icontains=s) | Q(username__icontains=s) | Q(telephone__icontains=s) + if ips.count() > 0: + query |= Q(ip_address__in=ips) + abons = Abon.objects.filter(query) else: abons = []