diff --git a/abonapp/forms.py b/abonapp/forms.py index 4d1d561..6275dfa 100644 --- a/abonapp/forms.py +++ b/abonapp/forms.py @@ -15,7 +15,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 diff --git a/abonapp/templates/abonapp/group_list.html b/abonapp/templates/abonapp/group_list.html index 80b82ea..dbe9a83 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 breadcrumb %}
    @@ -9,7 +10,7 @@ {% endblock %} {% block page-header %} -

    {% trans 'User groups' %}

    + {% trans 'User groups' %} {% endblock %} {% block main %} @@ -19,7 +20,7 @@ # - + {% trans 'Group title' %} {% if order_by == 'title' %}{% endif %} diff --git a/abonapp/templates/abonapp/peoples.html b/abonapp/templates/abonapp/peoples.html index 1d70762..25f1d7d 100644 --- a/abonapp/templates/abonapp/peoples.html +++ b/abonapp/templates/abonapp/peoples.html @@ -25,7 +25,7 @@ # - + {% trans 'Sub' %} {% if order_by == 'username' %}{% endif %} @@ -38,13 +38,13 @@ {% if order_by == 'fio' %}{% endif %} - + {% trans 'Street' %} {% if order_by == 'street' %}{% endif %} - + {% trans 'Apartment' %} {% if order_by == 'house' %}{% endif %} @@ -52,7 +52,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 1553b85..b0f065b 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 @@ -590,7 +590,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')) @@ -1026,6 +1027,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_context_data(self, **kwargs): context = super(EditSibscriberMarkers, self).get_context_data(**kwargs) context['gid'] = self.kwargs.get('gid') 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' %} -
  1. - {% trans 'Language' %} - -
    2. +{#
  2. #} +{# {% trans 'Language' %} #} +{# #} +{#
    3. #}
  3. {% trans 'Other' %} diff --git a/devapp/dev_types.py b/devapp/dev_types.py index c073063..d1df5cf 100644 --- a/devapp/dev_types.py +++ b/devapp/dev_types.py @@ -311,6 +311,7 @@ class EltexPort(BasePort): class EltexSwitch(DLinkDevice): description = _('Eltex switch') is_use_device_port = False + has_attachable_to_subscriber = True def get_ports(self) -> ListOrError: res = [] diff --git a/devapp/forms.py b/devapp/forms.py index c522a4a..a023b8a 100644 --- a/devapp/forms.py +++ b/devapp/forms.py @@ -9,6 +9,20 @@ 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') + 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 + mac_addr = forms.CharField(widget=forms.TextInput(attrs={ 'pattern': MAC_ADDR_REGEX, 'required': True diff --git a/devapp/models.py b/devapp/models.py index 7933583..1e6eb53 100644 --- a/devapp/models.py +++ b/devapp/models.py @@ -74,11 +74,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') diff --git a/devapp/templates/devapp/devices.html b/devapp/templates/devapp/devices.html index da5b9be..5a99633 100644 --- a/devapp/templates/devapp/devices.html +++ b/devapp/templates/devapp/devices.html @@ -21,20 +21,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 ab6775c..21c3af5 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 breadcrumb %}
      @@ -19,19 +20,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/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/devapp/views.py b/devapp/views.py index f1adfec..67a27b5 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') @@ -505,7 +500,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/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/djing/global_base_views.py b/djing/global_base_views.py index 7d38b6e..1377726 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): @@ -149,5 +141,5 @@ class BaseListWithFiltering(RedirectWhenErrorMixin, ListView): }) -class BaseOrderedFilteringList(OrderingMixin, BaseListWithFiltering): +class OrderedFilteredList(OrderingMixin, BaseListWithFiltering): paginate_by = getattr(settings, 'PAGINATION_ITEMS_PER_PAGE', 10) 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' diff --git a/djing/settings.py b/djing/settings.py index 6d2e73f..ee93093 100644 --- a/djing/settings.py +++ b/djing/settings.py @@ -93,6 +93,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/docs/dev.md b/docs/dev.md index 09ca0ec..72a395e 100644 --- a/docs/dev.md +++ b/docs/dev.md @@ -97,7 +97,7 @@ class EltexSwitch(DLinkDevice): Свойство **@is_use_device_port** используется в DHCP чтоб понять что мы используем для привязки к абоненту всё устройство или только порт устройства. Например, если у устройства только 1 порт абонента (PON ONU), и мы привязываем этого абонента ко всему устройству -а не к порту, то нужно вернуть False, На обычных свичах где мы авторизуем абонента на порту возвращаем True. +а не к порту, то нужно указать False, На обычных свичах где мы авторизуем абонента на порту возвращаем True. Реализация SNMPBaseWorker по сути не нужна, класс абстрактных методов не имеет. Потому когда наследуем наследуемся от *DevBase* то в базовые классы добавим и SNMPBaseWorker, как это сделано в *DLinkDevice*: diff --git a/group_app/templates/group_app/group_list.html b/group_app/templates/group_app/group_list.html index bce8572..5411490 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 breadcrumb %}
        @@ -22,7 +23,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/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) diff --git a/tariff_app/templates/tariff_app/tarifs.html b/tariff_app/templates/tariff_app/tarifs.html index d87e70b..76cd346 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'