избавился от ip_pool

djing/urls.py

@@ -10,7 +10,6 @@ urlpatterns = [
     url(r'^accounts/', include('accounts_app.urls', namespace='acc_app')),
     url(r'^abons/', include('abonapp.urls', namespace='abonapp')),
     url(r'^tarifs/', include('tariff_app.urls', namespace='tarifs')),
-    url(r'^ip_pool/', include('ip_pool.urls', namespace='ip_pool')),
     url(r'^search/', include('searchapp.urls', namespace='searchapp')),
     url(r'^dev/', include('devapp.urls', namespace='devapp')),
     url(r'^map/', include('mapapp.urls', namespace='mapapp')),

searchapp/views.py

@@ -1,10 +1,8 @@
 import re
-
 from django.db.models import Q
 from django.shortcuts import render
 from django.utils.html import escape
-
-from abonapp.models import Abon, IpPoolItem
+from abonapp.models import Abon
 
 
 def replace_without_case(orig, old, new):
@@ -15,10 +13,7 @@ def home(request):
     s = request.GET.get('s')
 
     if 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)
+        query = Q(fio__icontains=s) | Q(username__icontains=s) | Q(telephone__icontains=s) | Q(ip_address=s)
         abons = Abon.objects.filter(query)
     else:
         abons = []

templates/base.html

@@ -63,13 +63,6 @@
                     <span class="glyphicon glyphicon-envelope"></span> внутренняя переписка
                 </a></li>
 
-
-            {% url 'ip_pool:home' as ip_pool_home %}
-            <li{% if ip_pool_home in request.path %} class="active"{% endif %}>
-                <a href="{{ ip_pool_home }}">
-                    <span class="glyphicon glyphicon-compressed"></span> ip пул
-                </a></li>
-
             {% url 'devapp:group_list' as devapp_groups %}
             <li{% if devapp_groups in request.path %} class="active"{% endif %}>
                 <a href="{{ devapp_groups }}">