diff --git a/abonapp/views.py b/abonapp/views.py index ebc4785..0a87d0a 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -763,6 +763,7 @@ def save_user_dev_port(request, gid, uname): return redirect('abonapp:abon_home', gid, uname) user_port = mydefs.safe_int(request.POST.get('user_port')) is_dynamic_ip = request.POST.get('is_dynamic_ip') + is_dynamic_ip = True if is_dynamic_ip == 'on' else False try: abon = models.Abon.objects.get(username=uname) if user_port == 0: @@ -788,10 +789,7 @@ def save_user_dev_port(request, gid, uname): abon.dev_port = port if abon.is_dynamic_ip != is_dynamic_ip: - if is_dynamic_ip == 'on': - abon.is_dynamic_ip = True - else: - abon.is_dynamic_ip = False + abon.is_dynamic_ip = is_dynamic_ip abon.save(update_fields=['dev_port', 'is_dynamic_ip']) else: abon.save(update_fields=['dev_port']) diff --git a/cron.py b/cron.py index 70446bf..13879a8 100755 --- a/cron.py +++ b/cron.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 import os import django + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "djing.settings") django.setup() from django.utils import timezone @@ -13,7 +14,7 @@ from mydefs import LogicError def main(): signals.pre_delete.disconnect(abontariff_pre_delete, sender=AbonTariff) - # AbonTariff.objects.filter(abon=None).delete() + AbonTariff.objects.filter(abon=None).delete() now = timezone.now() fields = ('id', 'tariff__title', 'abon__id') expired_services = AbonTariff.objects.filter(deadline__lt=now).exclude(abon=None) @@ -37,7 +38,7 @@ def main(): # sync subscribers on NAS try: tm = Transmitter() - users = Abon.objects.filter(is_dynamic_ip=False, is_active=True).exclude(current_tariff=None) + users = Abon.objects.filter(is_active=True).exclude(current_tariff=None) tm.sync_nas(users) except NasNetworkError as e: print('NetworkTrouble:', e) diff --git a/devapp/views.py b/devapp/views.py index 21595ac..f56ad9c 100644 --- a/devapp/views.py +++ b/devapp/views.py @@ -366,7 +366,7 @@ def devview(request, device_id): if dev.man_passw: manager = dev.get_manager_object() ports = manager.get_ports() - if isinstance(ports[0], Exception): + if len(ports) > 0 and isinstance(ports[0], Exception): messages.error(request, ports[0]) ports = ports[1] template_name = manager.get_template_name()