From e3f5b5b78670e507623ad84b9afe68e71f4eb61d Mon Sep 17 00:00:00 2001
From: bashmak <nerosketch@gmail.com>
Date: Thu, 18 May 2017 16:02:48 +0300
Subject: [PATCH] FIXBUG

---
 abonapp/locale/ru/LC_MESSAGES/django.po |  3 +++
 abonapp/views.py                        | 32 ++++++++++++-------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/abonapp/locale/ru/LC_MESSAGES/django.po b/abonapp/locale/ru/LC_MESSAGES/django.po
index c3328c8..40513ea 100644
--- a/abonapp/locale/ru/LC_MESSAGES/django.po
+++ b/abonapp/locale/ru/LC_MESSAGES/django.po
@@ -787,6 +787,9 @@ msgstr "Поле или одно из полей не найдено"
 msgid "ok ping, %d/%d loses"
 msgstr "пингуется, %d/%d"
 
+msgid "no ping, %d/%d loses"
+msgstr "не пингуется, %d/%d"
+
 msgid "no ping"
 msgstr "не пингуется"
 
diff --git a/abonapp/views.py b/abonapp/views.py
index ebda7d5..ae74fe6 100644
--- a/abonapp/views.py
+++ b/abonapp/views.py
@@ -829,36 +829,34 @@ def extra_field_delete(request, gid, uid, fid):
 def abon_ping(request):
     ip = request.GET.get('cmd_param')
     status = False
-    text = _('no ping')
+    text = '<span class="glyphicon glyphicon-exclamation-sign"></span> %s' % _('no ping')
     try:
         tm = Transmitter()
-        r = tm.ping(ip)
-        if r is None:
+        ping_result = tm.ping(ip)
+        if ping_result is None:
             if mydefs.ping(ip, 10):
                 status = True
-                text = _('ping ok')
+                text = '<span class="glyphicon glyphicon-ok"></span> %s' % _('ping ok')
         else:
-            if type(r) is tuple:
-                text = _('ok ping, %d/%d loses') % r
+            if type(ping_result) is tuple:
+                loses_percent = (ping_result[0] / ping_result[1])
+                if loses_percent > 0.5:
+                    text = '<span class="glyphicon glyphicon-ok"></span> %s' % _('ok ping, %d/%d loses') % ping_result
+                    status = True
+                else:
+                    text = '<span class="glyphicon glyphicon-exclamation-sign"></span> %s' % _('no ping, %d/%d loses') % ping_result
             else:
-                text = _('ping ok') + ' ' + str(r)
-            status = True
+                text = '<span class="glyphicon glyphicon-ok"></span> %s' % _('ping ok') + ' ' + str(ping_result)
+                status = True
 
     except NasFailedResult as e:
         messages.error(request, e)
     except NasNetworkError as e:
         messages.warning(request, e)
 
-    if status:
-        status = 0
-        res = '<span class="glyphicon glyphicon-ok"></span> %s' % text
-    else:
-        status = 1
-        res = '<span class="glyphicon glyphicon-exclamation-sign"></span> %s' % text
-
     return HttpResponse(dumps({
-        'status': status,
-        'dat': res
+        'status': 0 if status else 1,
+        'dat': text
     }))