diff --git a/abonapp/locale/ru/LC_MESSAGES/django.po b/abonapp/locale/ru/LC_MESSAGES/django.po index ac9e7a6..1e734a0 100644 --- a/abonapp/locale/ru/LC_MESSAGES/django.po +++ b/abonapp/locale/ru/LC_MESSAGES/django.po @@ -339,7 +339,7 @@ msgstr "куда" #: abonapp/templates/abonapp/dial_log.html:12 msgid "duration" -msgstr "продолжительность" +msgstr "прод." #: abonapp/templates/abonapp/dial_log.html:13 msgid "start" diff --git a/agent/mod_mikrotik.py b/agent/mod_mikrotik.py index 3d92201..b3b6ff1 100644 --- a/agent/mod_mikrotik.py +++ b/agent/mod_mikrotik.py @@ -249,7 +249,7 @@ class QueueManager(TransmitterManager, metaclass=ABCMeta): def remove_range(self, q_ids): try: - q_ids = [q.queue_id for q in q_ids] + #q_ids = [q.queue_id for q in q_ids] return self._exec_cmd(['/queue/simple/remove', '=numbers=' + ','.join(q_ids)]) except TypeError as e: print(e) diff --git a/clientsideapp/templates/clientsideapp/ext.html b/clientsideapp/templates/clientsideapp/ext.html index ba81d1a..9ec2214 100644 --- a/clientsideapp/templates/clientsideapp/ext.html +++ b/clientsideapp/templates/clientsideapp/ext.html @@ -95,7 +95,6 @@

Напишите разработчику djing-developer@yandex.ru. - П.С. Разработчик и ваш провайдер не одно и то же.

diff --git a/dialing_app/templates/index.html b/dialing_app/templates/index.html index adc5061..68fadb2 100644 --- a/dialing_app/templates/index.html +++ b/dialing_app/templates/index.html @@ -21,22 +21,22 @@ {% for log in logs %} - + - + - {{ log.calldate|date:'d E Y, H:i:s' }} + {{ log.calldate|date:'d M, H:i:s' }} {{ log.src|abon_if_telephone|safe }} {{ log.dst|abon_if_telephone|safe }} {{ log.duration }} - {{ log.start|date:'d E Y, H:i:s' }} - {{ log.answer|date:'d E Y, H:i:s' }} - {{ log.end|date:'d E Y, H:i:s' }} + {{ log.start|date:'d M, H:i:s' }} + {{ log.answer|date:'d M, H:i:s' }} + {{ log.end|date:'d M, H:i:s' }} {{ log.locate_disposition }} {% empty %} diff --git a/templates/404.html b/templates/404.html index 0eb1ccd..7bb769f 100644 --- a/templates/404.html +++ b/templates/404.html @@ -37,7 +37,7 @@

404 - Страница не найдена

-

Такого пути '{{ request.path }}' нет нет на сервере

+

Такого пути '{{ request.path }}' нет на сервере

На главную