Merge branch 'global_group_update' into devel

abonapp/models.py

@@ -279,7 +279,7 @@ class Abon(BaseAccount):
         super(Abon, self).save(*args, **kwargs)
 
     def sync_with_nas(self, created: bool) -> Optional[Union[Exception, bool]]:
-        timeout = None
+        timeout = 0
         if hasattr(self, 'is_dhcp') and self.is_dhcp:
             timeout = getattr(settings, 'DHCP_TIMEOUT', 14400)
         agent_abon = self.build_agent_struct()

agent/mod_mikrotik.py

@@ -380,7 +380,7 @@ class IpAddressListManager(TransmitterManager, metaclass=ABCMeta):
         ])
 
     def read_ips_iter(self, list_name: str):
-        ips: Iterable = self._exec_cmd_iter([
+        ips = self._exec_cmd_iter([
             '/ip/firewall/address-list/print', 'where',
             '?list=%s' % list_name,
             '?dynamic=no'
@@ -424,7 +424,7 @@ class MikrotikTransmitter(QueueManager, IpAddressListManager):
             if ip_list_entity is not None and len(ip_list_entity) > 1:
                 IpAddressListManager.remove(self, ip_list_entity[0]['=.id'])
 
-    def add_user(self, user: AbonStruct, ip_timeout=None):
+    def add_user(self, user: AbonStruct, ip_timeout=0):
         super(MikrotikTransmitter, self).add_user(user, ip_timeout)
         if not isinstance(user.ip, IpStruct):
             raise TypeError
@@ -445,7 +445,7 @@ class MikrotikTransmitter(QueueManager, IpAddressListManager):
             IpAddressListManager.remove(self, firewall_ip_list_obj[0]['=.id'])
 
     # обновляем основную инфу абонента
-    def update_user(self, user: AbonStruct, ip_timeout=None):
+    def update_user(self, user: AbonStruct, ip_timeout=0):
         super(MikrotikTransmitter, self).update_user(user, ip_timeout)
         if not isinstance(user.ip, IpStruct):
             raise TypeError

taskapp/locale/ru/LC_MESSAGES/django.po

@@ -460,3 +460,5 @@ msgstr "Автор не указан"
 msgid "Name and comment count"
 msgstr "Имя и количество комментов"
 
+msgid "None"
+msgstr "Нету"

taskapp/templates/taskapp/tasklist_all.html

@@ -63,7 +63,7 @@
                 {% endif %}
 
                 <td>{{ task.get_mode_display }}</td>
-                <td>{{ task.descr }}</td>
+                <td>{{ task.descr|default:_('None') }}</td>
                 <td>{% if task.author %}
                     <a href="{% url 'acc_app:other_profile' task.author.pk %}" title="{{ task.author.get_full_name }}" data-toggle="tooltip">
                         {{ task.author.username }}

taskapp/templates/taskapp/tasklist_finish.html

@@ -51,7 +51,7 @@
                 {% endif %}
 
                 <td>{{ task.get_mode_display }}</td>
-                <td>{{ task.descr }}</td>
+                <td>{{ task.descr|default:_('None') }}</td>
                 <td>
                     {% if task.author %}
                     <a href="{% url 'acc_app:other_profile' task.author.pk %}" data-toggle="tooltip" title="{{ task.author.get_full_name }}">