From 5c5630adc1956e4f8eb92c93edebd27ea91c4a3c Mon Sep 17 00:00:00 2001 From: bashmak Date: Thu, 14 Jun 2018 17:24:48 +0300 Subject: [PATCH 1/7] Fix init device types --- abonapp/views.py | 3 +- agent/commands/dhcp.py | 2 +- devapp/base_intr.py | 6 ++- devapp/dev_types.py | 40 ++++++------------- devapp/models.py | 14 +++---- .../templates/devapp/manage_ports/list.html | 2 +- docs/dev.md | 8 ++-- 7 files changed, 30 insertions(+), 45 deletions(-) diff --git a/abonapp/views.py b/abonapp/views.py index ed1a717..afd4b72 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -602,7 +602,8 @@ def clear_dev(request, gid, uname): abon = models.Abon.objects.get(username=uname) abon.device = None abon.dev_port = None - abon.save(update_fields=('device', 'dev_port')) + abon.is_dynamic_ip = False + abon.save(update_fields=('device', 'dev_port', 'is_dynamic_ip')) messages.success(request, _('Device has successfully unattached')) except models.Abon.DoesNotExist: messages.error(request, _('Abon does not exist')) diff --git a/agent/commands/dhcp.py b/agent/commands/dhcp.py index 92051a8..f73db47 100644 --- a/agent/commands/dhcp.py +++ b/agent/commands/dhcp.py @@ -9,7 +9,7 @@ def dhcp_commit(client_ip: str, client_mac: str, switch_mac: str, switch_port: i dev = Device.objects.get(mac_addr=switch_mac) mngr_class = dev.get_manager_klass() - if mngr_class.is_use_device_port(): + if mngr_class.is_use_device_port: abon = Abon.objects.get(dev_port__device=dev, dev_port__num=switch_port, device=dev) diff --git a/devapp/base_intr.py b/devapp/base_intr.py index 3b63998..0d35450 100644 --- a/devapp/base_intr.py +++ b/devapp/base_intr.py @@ -49,12 +49,14 @@ class DevBase(object, metaclass=ABCMeta): def get_template_name(self) -> AnyStr: """Return path to html template for device""" + @property @abstractmethod def has_attachable_to_subscriber(self) -> bool: """Can connect device to subscriber""" - @abstract_static_method - def is_use_device_port() -> bool: + @property + @abstractmethod + def is_use_device_port(self) -> bool: """True if used device port while opt82 authorization""" # fixme: only that is abstract static diff --git a/devapp/dev_types.py b/devapp/dev_types.py index 7baf5e0..31aeb0b 100644 --- a/devapp/dev_types.py +++ b/devapp/dev_types.py @@ -60,6 +60,9 @@ class DLinkPort(BasePort): class DLinkDevice(DevBase, SNMPBaseWorker): + has_attachable_to_subscriber = True + is_use_device_port = True + def __init__(self, dev_instance): DevBase.__init__(self, dev_instance) SNMPBaseWorker.__init__(self, dev_instance.ip_address, dev_instance.man_passw, 2) @@ -103,13 +106,6 @@ class DLinkDevice(DevBase, SNMPBaseWorker): def get_template_name(self): return 'ports.html' - def has_attachable_to_subscriber(self) -> bool: - return True - - @staticmethod - def is_use_device_port(): - return True - @staticmethod def validate_extra_snmp_info(v: str) -> None: # Dlink has no require snmp info @@ -142,6 +138,9 @@ class ONUdev(BasePort): class OLTDevice(DevBase, SNMPBaseWorker): + has_attachable_to_subscriber = False + is_use_device_port = False + def __init__(self, dev_instance): DevBase.__init__(self, dev_instance) SNMPBaseWorker.__init__(self, dev_instance.ip_address, dev_instance.man_passw, 2) @@ -187,13 +186,6 @@ class OLTDevice(DevBase, SNMPBaseWorker): def get_template_name(self): return 'olt.html' - def has_attachable_to_subscriber(self) -> bool: - return False - - @staticmethod - def is_use_device_port(): - return False - @staticmethod def validate_extra_snmp_info(v: str) -> None: # Olt has no require snmp info @@ -208,6 +200,9 @@ class OLTDevice(DevBase, SNMPBaseWorker): class OnuDevice(DevBase, SNMPBaseWorker): + has_attachable_to_subscriber = True + is_use_device_port = False + def __init__(self, dev_instance): DevBase.__init__(self, dev_instance) dev_ip_addr = None @@ -242,13 +237,6 @@ class OnuDevice(DevBase, SNMPBaseWorker): def get_template_name(self): return "onu.html" - def has_attachable_to_subscriber(self) -> bool: - return True - - @staticmethod - def is_use_device_port(): - return False - def get_details(self): if self.db_instance is None: return @@ -330,6 +318,9 @@ class EltexPort(BasePort): class EltexSwitch(DLinkDevice): + has_attachable_to_subscriber = True + is_use_device_port = False + @staticmethod def description(): return _('Eltex switch') @@ -355,13 +346,6 @@ class EltexSwitch(DLinkDevice): tm = RuTimedelta(timedelta(seconds=uptimestamp / 100)) or RuTimedelta(timedelta()) return tm - def has_attachable_to_subscriber(self) -> bool: - return True - - @staticmethod - def is_use_device_port(): - return False - def monitoring_template(self, *args, **kwargs) -> Optional[str]: device = self.db_instance return plain_ip_device_mon_template(device) diff --git a/devapp/models.py b/devapp/models.py index b0a94ee..5f2dedd 100644 --- a/devapp/models.py +++ b/devapp/models.py @@ -73,11 +73,11 @@ class Device(models.Model): return self.status def get_manager_klass(self): - klasses = tuple(kl for kl in self.DEVICE_TYPES if kl[0] == self.devtype) - if len(klasses) > 0: - res = klasses[0][1] - if issubclass(res, DevBase): - return res + klasses = next(kl for kl in self.DEVICE_TYPES if kl[0] == self.devtype) + if klasses: + code, dev_class = klasses + if issubclass(dev_class, DevBase): + return dev_class raise TypeError('one of types is not subclass of DevBase. ' 'Or implementation of that device type is not found') @@ -89,8 +89,8 @@ class Device(models.Model): # Can attach device to subscriber in subscriber page def has_attachable_to_subscriber(self) -> bool: - mngr = self.get_manager_object() - return mngr.has_attachable_to_subscriber() + mngr = self.get_manager_klass() + return mngr.has_attachable_to_subscriber def __str__(self): return "%s: (%s) %s %s" % (self.comment, self.get_devtype_display(), self.ip_address or '', self.mac_addr or '') diff --git a/devapp/templates/devapp/manage_ports/list.html b/devapp/templates/devapp/manage_ports/list.html index e578479..a8bebe6 100644 --- a/devapp/templates/devapp/manage_ports/list.html +++ b/devapp/templates/devapp/manage_ports/list.html @@ -27,7 +27,7 @@ {% else %} {{ port.num_abons }} {% endif %} - + diff --git a/docs/dev.md b/docs/dev.md index b9f728e..94713bc 100644 --- a/docs/dev.md +++ b/docs/dev.md @@ -47,6 +47,7 @@ class EltexPort(BasePort): Теперь реализация для свича: ```python class EltexSwitch(DLinkDevice): + is_use_device_port = False @staticmethod def description(): @@ -80,9 +81,6 @@ class EltexSwitch(DLinkDevice): def has_attachable_to_subscriber(self) -> bool: return False - @staticmethod - def is_use_device_port(): - return False ``` Метод **@description** Просто отображает человекопонятное название вашего устройства в биллинге. Заметьте что строка на английском и заключена в процедуру **_** (это ugettext_lazy, см. в импорте вверху файла), @@ -102,9 +100,9 @@ class EltexSwitch(DLinkDevice): Например у Dlink стоит True потому что Dlink стоит во многих местах на доступе, и его порты принадлежат абонентам при авторизации. -Статический метод **@is_use_device_port** используется в DHCP чтоб понять что мы используем для привязки к абоненту всё устройство или +Статическое свойство **@is_use_device_port** используется в DHCP чтоб понять что мы используем для привязки к абоненту всё устройство или только порт устройства. Например, если у устройства только 1 порт абонента (PON ONU), и мы привязываем этого абонента ко всему устройству -а не к порту, то нужно вернуть False, На обычных свичах где мы авторизуем абонента на порту возвращаем True. +а не к порту, то нужно указать False, На обычных свичах где мы авторизуем абонента на порту возвращаем True. Реализация SNMPBaseWorker по сути не нужна, класс абстрактных методов не имеет. Потому когда наследуем наследуемся от *DevBase* то в базовые классы добавим и SNMPBaseWorker, как это сделано в *DLinkDevice*: From 22b1b8e8308dc35fbde07af7d011d69e10904ad6 Mon Sep 17 00:00:00 2001 From: bashmak Date: Sat, 16 Jun 2018 14:19:25 +0300 Subject: [PATCH 2/7] fix generate_random_chars function --- abonapp/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abonapp/forms.py b/abonapp/forms.py index e0ebc59..b9cecda 100644 --- a/abonapp/forms.py +++ b/abonapp/forms.py @@ -16,7 +16,7 @@ def generate_random_chars(length=6, chars=digits, split=2, delimiter=''): try: models.Abon.objects.get(username=username) - return generate_random_username(length=length, chars=chars, split=split, delimiter=delimiter) + return generate_random_chars(length=length, chars=chars, split=split, delimiter=delimiter) except models.Abon.DoesNotExist: return username From 1b736e23ab446e754b0aaadee6faf01db46a9a2a Mon Sep 17 00:00:00 2001 From: bashmak Date: Fri, 22 Jun 2018 11:17:27 +0300 Subject: [PATCH 3/7] Fix bugs --- abonapp/views.py | 9 ++++++- .../templates/clientsideapp/ext.html | 24 +++++++++---------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/abonapp/views.py b/abonapp/views.py index afd4b72..4dc5db4 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -1,6 +1,6 @@ from typing import Dict, Optional from django.contrib.gis.shortcuts import render_to_text -from django.core.exceptions import PermissionDenied +from django.core.exceptions import PermissionDenied, ValidationError from django.db import IntegrityError, ProgrammingError, transaction from django.db.models import Count, Q from django.shortcuts import render, redirect, get_object_or_404, resolve_url @@ -1097,6 +1097,13 @@ class EditSibscriberMarkers(UpdateView): obj = models.Abon.objects.get(username=self.kwargs.get('uname')) return obj + def dispatch(self, request, *args, **kwargs): + try: + return super(EditSibscriberMarkers, self).dispatch(request, *args, **kwargs) + except ValidationError as e: + messages.error(request, e) + return self.render_to_response(self.get_context_data()) + def get_success_url(self): return resolve_url('abonapp:abon_home', self.kwargs.get('gid'), self.kwargs.get('uname')) diff --git a/clientsideapp/templates/clientsideapp/ext.html b/clientsideapp/templates/clientsideapp/ext.html index 4105265..305d090 100644 --- a/clientsideapp/templates/clientsideapp/ext.html +++ b/clientsideapp/templates/clientsideapp/ext.html @@ -51,18 +51,18 @@ {% trans 'Services' %} -
  • - {% trans 'Language' %} -
      - {% url 'set_language' as set_language_url %} - {% for lang in LANGUAGES %} -
    • {{ lang.1 }}
      • - - {% endfor %} -
    -
    • +{#
  • #} +{# {% trans 'Language' %} #} +{#
      #} +{# {% url 'set_language' as set_language_url %}#} +{# {% for lang in LANGUAGES %}#} +{#
    • {{ lang.1 }}
      • #} +{# #} +{# {% endfor %}#} +{#
    #} +{#
    • #}
  • {% trans 'Other' %} From 9b2c1171a6280b08cc015a22ca824925b91b156c Mon Sep 17 00:00:00 2001 From: bashmak Date: Tue, 26 Jun 2018 10:47:42 +0300 Subject: [PATCH 4/7] Fix ordering --- abonapp/templates/abonapp/group_list.html | 3 ++- abonapp/templates/abonapp/peoples.html | 12 ++++++------ abonapp/templatetags/__init__.py | 0 abonapp/views.py | 4 ++-- devapp/templates/devapp/devices.html | 6 +++--- devapp/templates/devapp/devices_null_group.html | 7 ++++--- devapp/views.py | 11 +++-------- djing/global_base_views.py | 12 ++++-------- djing/settings.py | 1 + {abonapp => djing}/templatetags/dpagination.py | 12 +++++++++++- group_app/templates/group_app/group_list.html | 3 ++- group_app/views.py | 6 ++++-- tariff_app/templates/tariff_app/tarifs.html | 9 +++++---- tariff_app/views.py | 15 ++++----------- 14 files changed, 51 insertions(+), 50 deletions(-) delete mode 100644 abonapp/templatetags/__init__.py rename {abonapp => djing}/templatetags/dpagination.py (51%) diff --git a/abonapp/templates/abonapp/group_list.html b/abonapp/templates/abonapp/group_list.html index d550ec0..082329d 100644 --- a/abonapp/templates/abonapp/group_list.html +++ b/abonapp/templates/abonapp/group_list.html @@ -1,5 +1,6 @@ {% extends 'base.html' %} {% load i18n %} +{% load dpagination %} {% block main %}
      @@ -17,7 +18,7 @@ # - + {% trans 'Group title' %} {% if order_by == 'title' %}{% endif %} diff --git a/abonapp/templates/abonapp/peoples.html b/abonapp/templates/abonapp/peoples.html index 93e8e46..8e38f16 100644 --- a/abonapp/templates/abonapp/peoples.html +++ b/abonapp/templates/abonapp/peoples.html @@ -23,32 +23,32 @@ # - + {% trans 'Sub' %} {% if order_by == 'username' %}{% endif %} {% trans 'Last traffic' %} - + {% trans 'Ip address' %} {% if order_by == 'ip_address' %}{% endif %} - + {% trans 'fio' %} {% if order_by == 'fio' %}{% endif %} - + {% trans 'Street' %} {% if order_by == 'street' %}{% endif %} - + {% trans 'Apartment' %} {% if order_by == 'house' %}{% endif %} @@ -56,7 +56,7 @@ {% trans 'Telephone' %} {% trans 'Service' %} - + {% trans 'Balance' %} {% if order_by == 'ballance' %}{% endif %} diff --git a/abonapp/templatetags/__init__.py b/abonapp/templatetags/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/abonapp/views.py b/abonapp/views.py index 4dc5db4..44cec78 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -30,10 +30,10 @@ from guardian.shortcuts import get_objects_for_user, assign_perm from guardian.decorators import permission_required_or_403 as permission_required from djing import ping from djing import lib -from djing.global_base_views import OrderingMixin, BaseListWithFiltering, SecureApiView +from djing.global_base_views import OrderedFilteredList, SecureApiView -class BaseAbonListView(OrderingMixin, BaseListWithFiltering): +class BaseAbonListView(OrderedFilteredList): paginate_by = getattr(settings, 'PAGINATION_ITEMS_PER_PAGE', 10) http_method_names = ('get',) diff --git a/devapp/templates/devapp/devices.html b/devapp/templates/devapp/devices.html index eeaee62..50ab582 100644 --- a/devapp/templates/devapp/devices.html +++ b/devapp/templates/devapp/devices.html @@ -18,20 +18,20 @@ # - + {% trans 'Ip address' %} {% if order_by == 'ip_address' %}{% endif %} - + {% trans 'Comment' %} {% if order_by == 'comment' %}{% endif %} {% trans 'Mac address' %} - + {% trans 'Device type' %} {% if order_by == 'devtype' %}{% endif %} diff --git a/devapp/templates/devapp/devices_null_group.html b/devapp/templates/devapp/devices_null_group.html index 3eeaaf0..bca1bef 100644 --- a/devapp/templates/devapp/devices_null_group.html +++ b/devapp/templates/devapp/devices_null_group.html @@ -1,5 +1,6 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n %} +{% load dpagination %} {% block main %}
        @@ -16,19 +17,19 @@ - + {% trans 'Ip address' %} {% if order_by == 'ip_address' %}{% endif %} - + {% trans 'Comment' %} {% if order_by == 'comment' %}{% endif %} - + {% trans 'Device type' %} {% if order_by == 'devtype' %}{% endif %} diff --git a/devapp/views.py b/devapp/views.py index 289c3e0..46e5a1d 100644 --- a/devapp/views.py +++ b/devapp/views.py @@ -30,13 +30,8 @@ from .models import Device, Port, DeviceDBException, DeviceMonitoringException from .forms import DeviceForm, PortForm, DeviceExtraDataForm -class BaseDeviceListView(global_base_views.BaseListWithFiltering): - http_method_names = ('get',) - paginate_by = getattr(settings, 'PAGINATION_ITEMS_PER_PAGE', 10) - - @method_decorator((login_required, only_admins), name='dispatch') -class DevicesListView(global_base_views.OrderingMixin, BaseDeviceListView): +class DevicesListView(global_base_views.OrderedFilteredList): context_object_name = 'devices' template_name = 'devapp/devices.html' @@ -63,7 +58,7 @@ class DevicesListView(global_base_views.OrderingMixin, BaseDeviceListView): @method_decorator((login_required, only_admins), name='dispatch') -class DevicesWithoutGroupsListView(global_base_views.OrderingMixin, BaseDeviceListView): +class DevicesWithoutGroupsListView(global_base_views.OrderedFilteredList): context_object_name = 'devices' template_name = 'devapp/devices_null_group.html' queryset = Device.objects.filter(group=None).only('comment', 'devtype', 'pk', 'ip_address') @@ -516,7 +511,7 @@ def toggle_port(request, device_id: int, portid: int, status=0): @method_decorator((login_required, only_admins), name='dispatch') -class GroupsListView(BaseDeviceListView): +class GroupsListView(global_base_views.OrderedFilteredList): context_object_name = 'groups' template_name = 'devapp/group_list.html' model = Group diff --git a/djing/global_base_views.py b/djing/global_base_views.py index 6896bf9..ae4878e 100644 --- a/djing/global_base_views.py +++ b/djing/global_base_views.py @@ -80,14 +80,6 @@ class OrderingMixin(object): def get_context_data(self, **kwargs): context = super(OrderingMixin, self).get_context_data(**kwargs) context['order_by'] = self.request.GET.get('order_by') - direction = self.request.GET.get('dir') - if direction == 'down': - direction = 'up' - elif direction == 'up': - direction = 'down' - else: - direction = '' - context['dir'] = direction return context def get_ordering(self): @@ -147,3 +139,7 @@ class BaseListWithFiltering(RedirectWhenErrorMixin, ListView): 'page_number': page_number, 'message': str(e) }) + + +class OrderedFilteredList(OrderingMixin, BaseListWithFiltering): + paginate_by = getattr(settings, 'PAGINATION_ITEMS_PER_PAGE', 10) diff --git a/djing/settings.py b/djing/settings.py index d8bbed9..02a8a5e 100644 --- a/djing/settings.py +++ b/djing/settings.py @@ -89,6 +89,7 @@ TEMPLATES = [ ], 'libraries': { 'globaltags': 'djing.templatetags.globaltags', + 'dpagination': 'djing.templatetags.dpagination' } }, }, diff --git a/abonapp/templatetags/dpagination.py b/djing/templatetags/dpagination.py similarity index 51% rename from abonapp/templatetags/dpagination.py rename to djing/templatetags/dpagination.py index e8232c7..2490c94 100644 --- a/abonapp/templatetags/dpagination.py +++ b/djing/templatetags/dpagination.py @@ -11,8 +11,18 @@ def url_page_replace(request, field, value): @register.simple_tag -def url_replace(request, *args, **kwargs): +def url_order_by(request, **kwargs): dict_ = request.GET.copy() for k, v in kwargs.items(): dict_[k] = v + direction = dict_.get('dir') + if direction is None: + direction = dict_.get('default_direction', 'up') + if direction == 'down': + direction = 'up' + elif direction == 'up': + direction = 'down' + else: + direction = '' + dict_['dir'] = direction return dict_.urlencode() diff --git a/group_app/templates/group_app/group_list.html b/group_app/templates/group_app/group_list.html index cc86158..8327014 100644 --- a/group_app/templates/group_app/group_list.html +++ b/group_app/templates/group_app/group_list.html @@ -1,5 +1,6 @@ {% extends 'base.html' %} {% load i18n %} +{% load dpagination %} {% block main %}
          @@ -18,7 +19,7 @@ # {% trans 'TeCo' %} - + {% trans 'Title' %} {% if order_by == 'title' %}{% endif %} diff --git a/group_app/views.py b/group_app/views.py index ebeb28d..5aaa5de 100644 --- a/group_app/views.py +++ b/group_app/views.py @@ -1,6 +1,6 @@ from django.db.models import Count from django.http import HttpResponseRedirect -from django.views.generic import ListView, UpdateView, CreateView, DeleteView +from django.views.generic import UpdateView, CreateView, DeleteView from django.contrib.auth.decorators import login_required from django.utils.translation import gettext_lazy as _ from django.utils.decorators import method_decorator @@ -8,12 +8,14 @@ from django.urls import reverse_lazy from django.contrib import messages from django.conf import settings from guardian.decorators import permission_required_or_403 as permission_required + +from djing.global_base_views import OrderedFilteredList from . import models from . import forms @method_decorator(login_required, name='dispatch') -class GroupListView(ListView): +class GroupListView(OrderedFilteredList): http_method_names = ('get',) paginate_by = getattr(settings, 'PAGINATION_ITEMS_PER_PAGE', 10) template_name = 'group_app/group_list.html' diff --git a/tariff_app/templates/tariff_app/tarifs.html b/tariff_app/templates/tariff_app/tarifs.html index 9512271..6201187 100644 --- a/tariff_app/templates/tariff_app/tarifs.html +++ b/tariff_app/templates/tariff_app/tarifs.html @@ -1,5 +1,6 @@ {% extends request.is_ajax|yesno:'nullcont.htm,tariff_app/ext.html' %} {% load i18n %} +{% load dpagination %} {% block content %}
          @@ -7,25 +8,25 @@ - + {% trans 'tariff' %} {% if order_by == 'title' %}{% endif %} - + {% trans 'Speed In' %} {% if order_by == 'speedIn' %}{% endif %} - + {% trans 'Speed Out' %} {% if order_by == 'speedOut' %}{% endif %} - + {% trans 'Price' %} {% if order_by == 'amount' %}{% endif %} diff --git a/tariff_app/views.py b/tariff_app/views.py index 13e5aaa..c9dd800 100644 --- a/tariff_app/views.py +++ b/tariff_app/views.py @@ -1,28 +1,21 @@ from django.contrib.auth.decorators import login_required -from django.contrib.gis.shortcuts import render_to_text from django.urls import reverse_lazy from django.utils.decorators import method_decorator from django.utils.translation import ugettext as _ from django.shortcuts import render, get_object_or_404, redirect from django.contrib import messages from django.core.exceptions import PermissionDenied -from django.views.generic import ListView, DeleteView -from django.conf import settings +from django.views.generic import DeleteView from guardian.decorators import permission_required_or_403 as permission_required -from djing.global_base_views import OrderingMixin +from djing.global_base_views import OrderedFilteredList from .models import Tariff, PeriodicPay from djing import lib from . import forms -class BaseServiceListView(ListView): - http_method_names = ('get',) - paginate_by = getattr(settings, 'PAGINATION_ITEMS_PER_PAGE', 10) - - @method_decorator((login_required, lib.decorators.only_admins), name='dispatch') -class TariffsListView(BaseServiceListView, OrderingMixin): +class TariffsListView(OrderedFilteredList): """ Show Services(Tariffs) list """ @@ -80,7 +73,7 @@ class TariffDeleteView(DeleteView): @method_decorator(login_required, name='dispatch') @method_decorator(permission_required('tariff_app.delete_tariff'), name='dispatch') -class PeriodicPaysListView(BaseServiceListView): +class PeriodicPaysListView(OrderedFilteredList): context_object_name = 'pays' model = PeriodicPay template_name = 'tariff_app/periodic_pays/list.html' From e7b1413800672ab584a953b36b46bf52478d04e3 Mon Sep 17 00:00:00 2001 From: bashmak Date: Tue, 26 Jun 2018 13:21:39 +0300 Subject: [PATCH 5/7] Include additional telephones to search results --- djing/fields.py | 6 +++--- searchapp/views.py | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/djing/fields.py b/djing/fields.py index 68328e5..c982beb 100644 --- a/djing/fields.py +++ b/djing/fields.py @@ -91,11 +91,11 @@ class MACAddressField(models.Field): return self.get_prep_value(value) except AddrFormatError: return None - elif lookup_type in ('in'): + elif lookup_type == 'in': try: macs = [] for mac in value: - macs += [self.get_prep_value(mac)] + macs.extend(self.get_prep_value(mac)) return macs except AddrFormatError: return None @@ -106,7 +106,7 @@ class MACAddressField(models.Field): try: from south.modelsinspector import add_introspection_rules - add_introspection_rules([], ["^macaddress\.fields\.MACAddressField"]) + add_introspection_rules((), ("^macaddress\.fields\.MACAddressField",)) except ImportError: pass diff --git a/searchapp/views.py b/searchapp/views.py index cf6f348..37e7731 100644 --- a/searchapp/views.py +++ b/searchapp/views.py @@ -23,16 +23,18 @@ def home(request): devices = Device.objects.filter(ip_address=s) else: abons = Abon.objects.filter( - Q(fio__icontains=s) | Q(username__icontains=s) | Q(telephone__icontains=s) + Q(fio__icontains=s) | Q(username__icontains=s) | Q(telephone__icontains=s) | + Q(additional_telephones__telephone__icontains=s) ) + if re.match(MAC_ADDR_REGEX, s): devices = Device.objects.filter(mac_addr=s) else: devices = Device.objects.filter(comment__icontains=s) else: - abons = [] - devices = [] + abons = () + devices = () for abn in abons: abn.fio = replace_without_case(escape(abn.fio), s, "%s" % s) From 9ce218fe0cbc4d4ccff505ac3f5bb6d85f5f0688 Mon Sep 17 00:00:00 2001 From: bashmak Date: Tue, 26 Jun 2018 17:40:25 +0300 Subject: [PATCH 6/7] Move comment from value to placeholder in HTML form --- devapp/forms.py | 11 +++++++++++ djing/local_settings.py.template | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/devapp/forms.py b/devapp/forms.py index c522a4a..4496900 100644 --- a/devapp/forms.py +++ b/devapp/forms.py @@ -9,6 +9,17 @@ from djing import MAC_ADDR_REGEX, IP_ADDR_REGEX class DeviceForm(forms.ModelForm): + + def __init__(self, *args, **kwargs): + """ + Move comment from value to placeholder in HTML form + """ + initial = kwargs.get('initial') + comment = initial.get('comment') + del initial['comment'] + super(DeviceForm, self).__init__(*args, **kwargs) + self.fields['comment'].widget.attrs['placeholder'] = comment + mac_addr = forms.CharField(widget=forms.TextInput(attrs={ 'pattern': MAC_ADDR_REGEX, 'required': True diff --git a/djing/local_settings.py.template b/djing/local_settings.py.template index cf26e13..dccee29 100644 --- a/djing/local_settings.py.template +++ b/djing/local_settings.py.template @@ -4,7 +4,7 @@ Custom settings for each system DEBUG = True -ALLOWED_HOSTS = ['*'] +ALLOWED_HOSTS = '*', DEFAULT_FROM_EMAIL = 'admin@yoursite.com' From afda2c2b0368904721a933b23df03481ad0ee9e5 Mon Sep 17 00:00:00 2001 From: bashmak Date: Tue, 26 Jun 2018 18:38:54 +0300 Subject: [PATCH 7/7] Fix --- devapp/forms.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/devapp/forms.py b/devapp/forms.py index 4496900..a023b8a 100644 --- a/devapp/forms.py +++ b/devapp/forms.py @@ -15,8 +15,11 @@ class DeviceForm(forms.ModelForm): Move comment from value to placeholder in HTML form """ initial = kwargs.get('initial') - comment = initial.get('comment') - del initial['comment'] + if initial: + comment = initial.get('comment') + del initial['comment'] + else: + comment = None super(DeviceForm, self).__init__(*args, **kwargs) self.fields['comment'].widget.attrs['placeholder'] = comment