|
|
|
@ -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 = [] |
|
|
|
|
|
|
|
|