Dmitry Novikov 7 years ago
parent
commit
10fe43a8dc
  1. 4
      abonapp/views.py
  2. 2
      clientsideapp/views.py
  3. 4
      devapp/dev_types.py
  4. 2
      djing/__init__.py
  5. 2
      gw_app/nas_managers/mod_mikrotik.py

4
abonapp/views.py

@ -775,7 +775,7 @@ def abon_ping(request, gid: int, uname):
@json_view @json_view
def set_auto_continue_service(request, gid: int, uname): def set_auto_continue_service(request, gid: int, uname):
checked = request.GET.get('checked') checked = request.GET.get('checked')
checked = True if checked == 'true' else False
checked = checked == 'true'
abon = get_object_or_404(models.Abon, username=uname) abon = get_object_or_404(models.Abon, username=uname)
abon.autoconnect_service = checked abon.autoconnect_service = checked
abon.save(update_fields=('autoconnect_service',)) abon.save(update_fields=('autoconnect_service',))
@ -844,7 +844,7 @@ def save_user_dev_port(request, gid: int, uname):
return redirect('abonapp:abon_home', gid, uname) return redirect('abonapp:abon_home', gid, uname)
user_port = lib.safe_int(request.POST.get('user_port')) user_port = lib.safe_int(request.POST.get('user_port'))
is_dynamic_ip = request.POST.get('is_dynamic_ip') is_dynamic_ip = request.POST.get('is_dynamic_ip')
is_dynamic_ip = True if is_dynamic_ip == 'on' else False
is_dynamic_ip = is_dynamic_ip == 'on'
try: try:
abon = models.Abon.objects.get(username=uname) abon = models.Abon.objects.get(username=uname)
if user_port == 0: if user_port == 0:

2
clientsideapp/views.py

@ -140,7 +140,7 @@ def task_history(request):
@json_view @json_view
def set_auto_continue_service(request): def set_auto_continue_service(request):
checked = request.GET.get('checked') checked = request.GET.get('checked')
checked = True if checked == 'true' else False
checked = checked == 'true'
abon = request.user abon = request.user
abon.autoconnect_service = checked abon.autoconnect_service = checked
abon.save(update_fields=('autoconnect_service',)) abon.save(update_fields=('autoconnect_service',))

4
devapp/dev_types.py

@ -113,7 +113,7 @@ class DLinkDevice(DevBase, SNMPBaseWorker):
uptimes = self.get_list('.1.3.6.1.2.1.2.2.1.9') uptimes = self.get_list('.1.3.6.1.2.1.2.2.1.9')
try: try:
for num in ints: for num in ints:
status = True if int(next(stats)) == 1 else False
status = int(next(stats)) == 1
yield DLinkPort( yield DLinkPort(
num=num, num=num,
name=next(nams), name=next(nams),
@ -187,7 +187,7 @@ class OLTDevice(DevBase, SNMPBaseWorker):
onu = ONUdev( onu = ONUdev(
num=n, num=n,
name=self.get_item('.1.3.6.1.2.1.2.2.1.2.%d' % n), name=self.get_item('.1.3.6.1.2.1.2.2.1.2.%d' % n),
status=True if status == '3' else False,
status=status == '3',
mac=self.get_item('.1.3.6.1.4.1.3320.101.10.1.1.3.%d' % n), mac=self.get_item('.1.3.6.1.4.1.3320.101.10.1.1.3.%d' % n),
speed=0, speed=0,
signal=signal / 10 if signal else '', signal=signal / 10 if signal else '',

2
djing/__init__.py

@ -57,7 +57,7 @@ default_app_config = 'abonapp.apps.AbonappConfig'
def ping(ip_addr: str, count=1): def ping(ip_addr: str, count=1):
if re.match(IP_ADDR_REGEX, ip_addr): if re.match(IP_ADDR_REGEX, ip_addr):
response = os.system("`which ping` -4Anq -c%d -W1 %s > /dev/null" % (count, ip_addr)) response = os.system("`which ping` -4Anq -c%d -W1 %s > /dev/null" % (count, ip_addr))
return True if response == 0 else False
return response == 0
else: else:
return False return False

2
gw_app/nas_managers/mod_mikrotik.py

@ -235,7 +235,7 @@ class MikrotikTransmitter(core.BaseTransmitter, ApiRos,
name = info.get('=name') name = info.get('=name')
disabled = info.get('=disabled', False) disabled = info.get('=disabled', False)
if disabled is not None: if disabled is not None:
disabled = True if disabled == 'true' else False
disabled = disabled == 'true'
if target and name: if target and name:
# target may be '192.168.0.3/32,192.168.0.2/32' # target may be '192.168.0.3/32,192.168.0.2/32'
net = target.split(',')[0] net = target.split(',')[0]

Loading…
Cancel
Save