From 892f6809891eb816e3c2be3036123b2837c9f402 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Mon, 23 Oct 2017 15:07:40 +0300 Subject: [PATCH 1/2] fix --- abonapp/templates/abonapp/editAbon.html | 4 +- abonapp/templates/abonapp/group_list.html | 4 +- abonapp/templates/abonapp/peoples.html | 34 ++++----- accounts_app/templates/accounts/acc_list.html | 18 ++--- accounts_app/templates/accounts/login.html | 15 +++- agent/commands/dhcp.py | 4 +- agent/mod_mikrotik.py | 22 ++++-- .../templates/clientsideapp/ext.html | 2 +- devapp/models.py | 2 + .../templates/devapp/custom_dev_page/onu.html | 2 +- dhcp_lever.py | 44 +++++++++--- msg_app/admin.py | 5 +- msg_app/locale/ru/LC_MESSAGES/django.po | 2 +- mydefs.py | 9 +++ queue_mngr.py | 71 +++++++++++++------ systemd_units/djing_telebot.service | 2 +- telebot.py | 2 +- templates/all_base.html | 2 +- templates/base.html | 4 +- 19 files changed, 168 insertions(+), 80 deletions(-) diff --git a/abonapp/templates/abonapp/editAbon.html b/abonapp/templates/abonapp/editAbon.html index 5e93ebd..b06a456 100644 --- a/abonapp/templates/abonapp/editAbon.html +++ b/abonapp/templates/abonapp/editAbon.html @@ -4,7 +4,7 @@ {% block content %}
-
+

{% trans 'Change subscriber' %}

@@ -131,7 +131,7 @@
-
+
{% if perms.abonapp.change_abon %}
diff --git a/abonapp/templates/abonapp/group_list.html b/abonapp/templates/abonapp/group_list.html index 00362e7..6a22bb8 100644 --- a/abonapp/templates/abonapp/group_list.html +++ b/abonapp/templates/abonapp/group_list.html @@ -23,7 +23,7 @@ {% if order_by == 'title' %}{% endif %} - + {% trans 'Number of subscribers' %} # @@ -34,7 +34,7 @@ {{ gr.pk }} {{ gr.title }} - {{ gr.usercount }} + {{ gr.usercount }} {% if perms.abonapp.delete_abongroup %} {% if gr.usercount == 0 %} diff --git a/abonapp/templates/abonapp/peoples.html b/abonapp/templates/abonapp/peoples.html index eeadaae..07fee09 100644 --- a/abonapp/templates/abonapp/peoples.html +++ b/abonapp/templates/abonapp/peoples.html @@ -14,52 +14,52 @@

{% trans 'The people in the selected group' %}

-
+
- - + - - + - - - - - - + + - + @@ -70,7 +70,7 @@ {% else %} {% endif %} - - - + @@ -102,7 +102,7 @@ {% else %}——— {% endif %} - +
# + {% 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 %} {% trans 'Telephone' %}{% trans 'Service' %} + {% trans 'Telephone' %}{% trans 'Service' %}##
{% if human.stat_cache and human.stat_cache.is_online %} + {{ human.username }} + {{ human.ip_address|default:_('Not assigned') }}{{ human.ip_address|default:_('Not assigned') }} {{ human.fio }} {{ human.street|default:_('Not assigned') }} {{ human.house|default:'-' }}{{ human.ballance }} {% if can_del_trf %} @@ -140,7 +140,7 @@
-
+
{% trans 'Streets' %}
diff --git a/accounts_app/templates/accounts/acc_list.html b/accounts_app/templates/accounts/acc_list.html index ed5e52e..1704218 100644 --- a/accounts_app/templates/accounts/acc_list.html +++ b/accounts_app/templates/accounts/acc_list.html @@ -14,11 +14,11 @@ Фото - Ник - ФИО (или ник если нет) - Телефон - Email - — + Ник + ФИО (или ник если нет) + Телефон + Email + — @@ -30,11 +30,11 @@ {{ usr.username }} {{ usr.get_full_name }} - {% if usr.telephone %}{{ usr.telephone }}{% else %} + {% if usr.telephone %}{{ usr.telephone }}{% else %} Нету{% endif %} - {% if usr.email %}{{ usr.email }}{% else %} + {% if usr.email %}{{ usr.email }}{% else %} Нету{% endif %} - + @@ -78,4 +78,4 @@ {% include 'toolbar_page.html' with pag=users %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/accounts_app/templates/accounts/login.html b/accounts_app/templates/accounts/login.html index 4574387..4859768 100644 --- a/accounts_app/templates/accounts/login.html +++ b/accounts_app/templates/accounts/login.html @@ -15,6 +15,10 @@ margin: 10% auto; position: relative; } + footer{ + position: absolute; + bottom: 0; + } @@ -60,5 +64,14 @@
+
+
+

+ Напишите нам is-ttk@ya.ru. +

+
+
+
+ - \ No newline at end of file + diff --git a/agent/commands/dhcp.py b/agent/commands/dhcp.py index fd39c4e..be40075 100644 --- a/agent/commands/dhcp.py +++ b/agent/commands/dhcp.py @@ -20,12 +20,12 @@ def dhcp_commit(client_ip, client_mac, switch_mac, switch_port): print('D:', _('User settings is not dynamic')) return if not abon.is_access(): - print('D:', _('User is not access to service')) + print('D:', 'User %s is not access to service' % abon.username) return abon.ip_address = client_ip abon.is_dhcp = True abon.save(update_fields=['ip_address']) - print('S:', _("Ip address:'%s' update for '%s' successfull, on port: %s") % (client_ip, abon.get_short_name(), port)) + #print('S:', _("Ip address:'%s' update for '%s' successfull, on port: %s") % (client_ip, abon.get_short_name(), port)) except Abon.DoesNotExist: print('N:', _("User with device '%s' does not exist") % dev) except Device.DoesNotExist: diff --git a/agent/mod_mikrotik.py b/agent/mod_mikrotik.py index b3b6ff1..d78c6d1 100644 --- a/agent/mod_mikrotik.py +++ b/agent/mod_mikrotik.py @@ -4,7 +4,7 @@ import binascii from abc import ABCMeta from hashlib import md5 from .core import BaseTransmitter, NasFailedResult, NasNetworkError -from mydefs import ping +from mydefs import ping, singleton from .structs import TariffStruct, AbonStruct, IpStruct from . import settings as local_settings from django.conf import settings @@ -17,14 +17,23 @@ LIST_USERS_ALLOWED = 'DjingUsersAllowed' LIST_USERS_BLOCKED = 'DjingUsersBlocked' +@singleton class ApiRos: "Routeros api" + sk = None + is_login = False + + def __init__(self, ip, port): + if self.sk is None: + sk = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sk.connect((ip, port or getattr(local_settings, 'NAS_PORT', 8728))) + self.sk = sk - def __init__(self, sk): - self.sk = sk self.currenttag = 0 def login(self, username, pwd): + if self.is_login: + return chal = None for repl, attrs in self.talk_iter(["/login"]): chal = binascii.unhexlify(attrs['=ret']) @@ -34,6 +43,7 @@ class ApiRos: md.update(chal) for r in self.talk_iter(["/login", "=name=" + username, "=response=00" + binascii.hexlify(md.digest()).decode('utf-8')]): pass + self.is_login = True def talk_iter(self, words): if self.writeSentence(words) == 0: return @@ -143,6 +153,7 @@ class ApiRos: class TransmitterManager(BaseTransmitter, metaclass=ABCMeta): + def __init__(self, login=None, password=None, ip=None, port=None): ip = ip or getattr(local_settings, 'NAS_IP') if ip is None: @@ -150,10 +161,7 @@ class TransmitterManager(BaseTransmitter, metaclass=ABCMeta): if not ping(ip): raise NasNetworkError('NAS %s не пингуется' % ip) try: - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.connect((ip, port or getattr(local_settings, 'NAS_PORT', 8728))) - self.s = s - self.ar = ApiRos(s) + self.ar = ApiRos(ip, port) self.ar.login(login or getattr(local_settings, 'NAS_LOGIN'), password or getattr(local_settings, 'NAS_PASSW')) except ConnectionRefusedError: raise NasNetworkError('Подключение к %s отклонено (Connection Refused)' % ip) diff --git a/clientsideapp/templates/clientsideapp/ext.html b/clientsideapp/templates/clientsideapp/ext.html index 9ec2214..1d74f13 100644 --- a/clientsideapp/templates/clientsideapp/ext.html +++ b/clientsideapp/templates/clientsideapp/ext.html @@ -94,7 +94,7 @@ diff --git a/devapp/models.py b/devapp/models.py index c21f07f..7c74314 100644 --- a/devapp/models.py +++ b/devapp/models.py @@ -109,6 +109,8 @@ def dev_post_save_signal(sender, instance, **kwargs): code = 'uy' elif grp == 79 or grp == 91: code = 'zrk' + elif grp == 95: + code = 'yst' newmac = str(instance.mac_addr) call(["%s/devapp/onu_register.sh" % settings.BASE_DIR, newmac, code]) diff --git a/devapp/templates/devapp/custom_dev_page/onu.html b/devapp/templates/devapp/custom_dev_page/onu.html index 7ebb774..cfc2640 100644 --- a/devapp/templates/devapp/custom_dev_page/onu.html +++ b/devapp/templates/devapp/custom_dev_page/onu.html @@ -16,7 +16,7 @@