www-data 8 years ago
parent
commit
df9a735d25
  1. 3
      abonapp/models.py
  2. 2
      agent/mod_mikrotik.py

3
abonapp/models.py

@ -223,7 +223,8 @@ class Abon(BaseAccount):
else: else:
trf = abon_tariff.tariff trf = abon_tariff.tariff
agent_trf = TariffStruct(trf.id, trf.speedIn, trf.speedOut) agent_trf = TariffStruct(trf.id, trf.speedIn, trf.speedOut)
return AbonStruct(self.pk, abon_addresses, agent_trf, self.is_access())
if len(abon_addresses) > 0:
return AbonStruct(self.pk, abon_addresses, agent_trf, self.is_access())
def sync_with_nas(self, created: bool) -> Optional[Exception]: def sync_with_nas(self, created: bool) -> Optional[Exception]:
agent_abon = self.build_agent_struct() agent_abon = self.build_agent_struct()

2
agent/mod_mikrotik.py

@ -247,6 +247,8 @@ class MikrotikTransmitter(BaseTransmitter, ApiRos, metaclass=type('_ABC_Lazy_mcs
tariff=t, tariff=t,
is_access=disabled or False is_access=disabled or False
) )
if len(a.ips) < 1:
return
a.queue_id = info.get('=.id') a.queue_id = info.get('=.id')
return a return a
except ValueError as e: except ValueError as e:

Loading…
Cancel
Save