From 7362b984d97669e1dc1e02a51e53439c81aa8a23 Mon Sep 17 00:00:00 2001 From: bashmak Date: Mon, 15 May 2017 13:52:45 +0300 Subject: [PATCH] =?UTF-8?q?FIXBUG:=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- searchapp/views.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/searchapp/views.py b/searchapp/views.py index 260c4fb..30bc4c7 100644 --- a/searchapp/views.py +++ b/searchapp/views.py @@ -3,6 +3,7 @@ from django.db.models import Q from django.shortcuts import render from django.utils.html import escape from abonapp.models import Abon +from mydefs import ip_addr_regex def replace_without_case(orig, old, new): @@ -13,8 +14,12 @@ def home(request): s = request.GET.get('s') if s: - query = Q(fio__icontains=s) | Q(username__icontains=s) | Q(telephone__icontains=s) | Q(ip_address=s) - abons = Abon.objects.filter(query) + if bool(re.match(ip_addr_regex, s)): + abons = Abon.objects.filter(ip_address=s) + else: + abons = Abon.objects.filter( + Q(fio__icontains=s) | Q(username__icontains=s) | Q(telephone__icontains=s) + ) else: abons = []