From a9ae541d163d63fe232c11ff3605d5956b82583a Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Thu, 11 Jul 2019 20:40:16 +0300 Subject: [PATCH 1/8] fix --- djing/local_settings.py.example | 10 ---------- djing/settings.py | 6 +++--- docs/install_debian.md | 2 -- docs/install_fedora.md | 2 -- tariff_app/models.py | 4 ++++ 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/djing/local_settings.py.example b/djing/local_settings.py.example index 1bf13a2..70bd002 100644 --- a/djing/local_settings.py.example +++ b/djing/local_settings.py.example @@ -31,22 +31,12 @@ DATABASES = { } } -# path to asterisk dial records -DIALING_MEDIA = 'path/to/asterisk_records' DEFAULT_SNMP_PASSWORD = 'public' -TELEGRAM_BOT_TOKEN = 'bot token' - # Telephone or empty TELEPHONE_REGEXP = r'^(\+[7893]\d{10,11})?$' -ASTERISK_MANAGER_AUTH = { - 'username': 'admin', - 'password': 'password', - 'host': '127.0.0.1' -} - # Secret word for auth to api views by hash API_AUTH_SECRET = 'your api secret' diff --git a/djing/settings.py b/djing/settings.py index 1089d52..7b016e3 100644 --- a/djing/settings.py +++ b/djing/settings.py @@ -230,10 +230,10 @@ SERVER_EMAIL = getattr(local_settings, 'SERVER_EMAIL', EMAIL_HOST_USER) # REDIS related settings REDIS_HOST = 'localhost' -REDIS_PORT = '6379' -BROKER_URL = 'redis://' + REDIS_HOST + ':' + REDIS_PORT + '/0' +REDIS_PORT = 6379 +BROKER_URL = 'redis://%s:%d/0' % (REDIS_HOST, REDIS_PORT) BROKER_TRANSPORT_OPTIONS = {'visibility_timeout': 3600} -CELERY_RESULT_BACKEND = 'redis://' + REDIS_HOST + ':' + REDIS_PORT + '/0' +CELERY_RESULT_BACKEND = 'redis://%s:%d/0' % (REDIS_HOST, REDIS_PORT) # public url for Viber Bot diff --git a/docs/install_debian.md b/docs/install_debian.md index f11342b..9c30249 100644 --- a/docs/install_debian.md +++ b/docs/install_debian.md @@ -248,8 +248,6 @@ __sha256__. Секретное слово должен знать биллинг **COMPANY_NAME** — Название вашей компании, будет отображаться в шапке сайта в административной части и в личном кабинете абонента. -**TELEGRAM_BOT_TOKEN** — Когда вы включите оповещение через телеграм то вам сюда. - #### Создание БД Подразумевается что сервер баз данных у вас уже есть, или вы его можете установить сами. diff --git a/docs/install_fedora.md b/docs/install_fedora.md index dc7643e..59afd0d 100644 --- a/docs/install_fedora.md +++ b/docs/install_fedora.md @@ -221,8 +221,6 @@ __sha256__. то секретное слово должен знать билл **COMPANY_NAME** — Название вашей компании, будет отображаться в шапке сайта в административной части и в личном кабинете абонента. -**TELEGRAM_BOT_TOKEN** — Когда вы включите оповещение через телеграм то вам сюда. - #### Создание БД Подразумевается что сервер баз данных у вас уже есть, или вы его можете установить сами. diff --git a/tariff_app/models.py b/tariff_app/models.py index 98d02f5..44f7e0e 100644 --- a/tariff_app/models.py +++ b/tariff_app/models.py @@ -2,6 +2,7 @@ from datetime import datetime from django.db import models, IntegrityError from django.utils.translation import gettext_lazy as _ from django.dispatch import receiver +from django.shortcuts import resolve_url from .base_intr import TariffBase, PeriodicPayCalcBase from .custom_tariffs import TARIFF_CHOICES, PERIODIC_PAY_CHOICES from group_app.models import Group @@ -49,6 +50,9 @@ class Tariff(models.Model): def __str__(self): return "%s (%.2f)" % (self.title, self.amount) + def get_absolute_url(self): + return resolve_url('tarifs:edit', self.pk) + class Meta: db_table = 'tariffs' ordering = ('title',) From 33272505afc2bf1d666c910ea574d26e32852aec Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Fri, 12 Jul 2019 22:40:30 +0300 Subject: [PATCH 2/8] fix error when no customers exists --- ip_pool/models.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ip_pool/models.py b/ip_pool/models.py index 8c67d25..5e83e16 100644 --- a/ip_pool/models.py +++ b/ip_pool/models.py @@ -146,7 +146,10 @@ class NetworkModel(models.Model): continue elif ip > work_range_end_ip: break # Not found - used_ip = next(employed_ips) + try: + used_ip = next(employed_ips) + except StopIteration: + return ip if used_ip is None: return ip used_ip = ip_address(used_ip) From 9f295388382e089c47f59c3984aee39b71adc128 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Sat, 13 Jul 2019 00:43:22 +0300 Subject: [PATCH 3/8] ref --- taskapp/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taskapp/models.py b/taskapp/models.py index 2ddfc5d..97ab956 100644 --- a/taskapp/models.py +++ b/taskapp/models.py @@ -5,7 +5,7 @@ from django.db import models from django.conf import settings from django.shortcuts import resolve_url from django.utils import timezone -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext_lazy as _ from abonapp.models import Abon from .handle import handle as task_handle From 9fd049439e04d851fce48cde77866d47aa3e9da7 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Sat, 13 Jul 2019 01:18:25 +0300 Subject: [PATCH 4/8] remove unused method --- taskapp/models.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/taskapp/models.py b/taskapp/models.py index 97ab956..b78ba32 100644 --- a/taskapp/models.py +++ b/taskapp/models.py @@ -1,6 +1,5 @@ # coding=utf-8 from datetime import timedelta -import os from django.db import models from django.conf import settings from django.shortcuts import resolve_url @@ -137,9 +136,6 @@ class Task(models.Model): self.recipients.filter(is_active=True) ) - def get_attachment_fname(self): - return os.path.basename(self.attachment.name) - def is_relevant(self): return self.out_date < timezone.now().date() or self.state == 'F' From 9bec47aec8fcfd035efdbc6c564bcd840d9c1fae Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Sat, 13 Jul 2019 02:35:20 +0300 Subject: [PATCH 5/8] remove unused --- messenger/models.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/messenger/models.py b/messenger/models.py index 499a668..ffc0b6f 100644 --- a/messenger/models.py +++ b/messenger/models.py @@ -32,11 +32,11 @@ class Messenger(models.Model): if self.bot_type == 1: return resolve_url('messenger:update_viber_messenger', self.slug) - def get_next_url(self): - if self.bot_type == 1: # Viber - return resolve_url('messenger:update_viber_messenger', self.slug) - else: - return resolve_url('messenger:messengers_list') + # def get_next_url(self): + # if self.bot_type == 1: # Viber + # return resolve_url('messenger:update_viber_messenger', self.slug) + # else: + # return resolve_url('messenger:messengers_list') class ViberMessenger(Messenger): @@ -106,7 +106,7 @@ class ViberMessage(models.Model): msg = models.TextField(_('Message')) date = models.DateTimeField(_('Date'), auto_now_add=True) sender = models.CharField(_('Sender'), max_length=32) - messenger = models.ForeignKey(ViberMessenger, verbose_name=_('messenger'), on_delete=models.CASCADE) + messenger = models.ForeignKey(ViberMessenger, verbose_name=_('Messenger'), on_delete=models.CASCADE) subscriber = models.ForeignKey('ViberSubscriber', on_delete=models.SET_NULL, verbose_name=_('Subscriber'), null=True) def __str__(self): From 5243fda0e639778eda0cf9136b89a76969a1b578 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Sun, 14 Jul 2019 15:51:41 +0300 Subject: [PATCH 6/8] refa --- taskapp/handle.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/taskapp/handle.py b/taskapp/handle.py index 0356b8c..abf3281 100644 --- a/taskapp/handle.py +++ b/taskapp/handle.py @@ -23,7 +23,7 @@ def handle(task, author, recipients): task_status = _('Task') # If task completed or failed - if task.state == 'F' or task.state == 'C': + if task.state in ('F', 'C'): task_status = _('Task completed') fulltext = render_to_string('taskapp/notification.html', { @@ -33,12 +33,12 @@ def handle(task, author, recipients): }) try: - if task.state == 'F' or task.state == 'C': + if task.state in ('F', 'C'): # If task completed or failed than send one message to author send_email_notify.delay(fulltext, author.pk) send_viber_message.delay(None, author.pk, fulltext) else: - #multicast_email_notify.delay(fulltext, profile_ids) + # multicast_email_notify.delay(fulltext, profile_ids) multicast_viber_notify.delay(None, profile_ids, fulltext) except OperationalError as e: raise TaskException(e) From 941ed24317d964d4238892dce3004e2114478c47 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Tue, 16 Jul 2019 01:25:35 +0300 Subject: [PATCH 7/8] ref --- abonapp/views.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/abonapp/views.py b/abonapp/views.py index 7cc03ba..c8eb0fe 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -443,10 +443,7 @@ def pick_tariff(request, gid: int, uname): } if deadline: deadline = datetime.strptime(deadline, '%Y-%m-%dT%H:%M') - abon.pick_tariff(trf, request.user, deadline=deadline, - comment=log_comment) - else: - abon.pick_tariff(trf, request.user, comment=log_comment) + abon.pick_tariff(trf, request.user, deadline=deadline, comment=log_comment) customer_nas_command.delay(abon.pk, 'sync') messages.success(request, _('Tariff has been picked')) return redirect('abonapp:abon_services', gid=gid, From a018fc6170f5576ae03edfb5abef020351fd4629 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Tue, 16 Jul 2019 21:55:31 +0300 Subject: [PATCH 8/8] fix --- taskapp/templates/taskapp/add_edit_task.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/taskapp/templates/taskapp/add_edit_task.html b/taskapp/templates/taskapp/add_edit_task.html index 0b9fcef..e944fba 100644 --- a/taskapp/templates/taskapp/add_edit_task.html +++ b/taskapp/templates/taskapp/add_edit_task.html @@ -24,9 +24,9 @@
{% if task.id %} -

{% trans 'Add new task' %}

- {% else %}

{% trans 'Edit task' %}

+ {% else %} +

{% trans 'Add new task' %}

{% endif %}