From b6abdd61322b4906469d4b2065c25f3fd4ac2823 Mon Sep 17 00:00:00 2001
From: zhengxie <xiez1989@gmail.com>
Date: Thu, 27 Sep 2018 15:23:55 +0800
Subject: [PATCH] [sys] Update traffic admin and user_traffic_over_limit func

---
 .../templates/sysadmin/sys_statistic_traffic.html  |  6 +++---
 seahub/templates/sysadmin/sys_trafficadmin.html    | 14 ++++++++------
 seahub/utils/__init__.py                           |  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/seahub/templates/sysadmin/sys_statistic_traffic.html b/seahub/templates/sysadmin/sys_statistic_traffic.html
index c05dda0af2..cdc318d105 100644
--- a/seahub/templates/sysadmin/sys_statistic_traffic.html
+++ b/seahub/templates/sysadmin/sys_statistic_traffic.html
@@ -19,13 +19,13 @@
 
 <ul class="traffic-tab-nav">
     <li class="tab tab-cur">
-        <a href="{% url 'sys_statistic_traffic' %}" class="a">{% trans "System" context "system traffic" %}</a>
+        <a href="{% url 'sys_statistic_traffic' %}" class="a">{% trans "System" %}</a>
     </li>
     <li class="tab">
-        <a href="?type=user" class="a">{% trans "Users" context "user traffic" %}</a>
+        <a href="?type=user" class="a">{% trans "Users" %}</a>
     </li>
     <li class="tab">
-        <a href="?type=org" class="a">{% trans "Organizations" context "organization traffic" %}</a>
+        <a href="?type=org" class="a">{% trans "Organizations" %}</a>
     </li>
 </ul>
 
diff --git a/seahub/templates/sysadmin/sys_trafficadmin.html b/seahub/templates/sysadmin/sys_trafficadmin.html
index 7fc4ba31f3..dcb3bf3701 100644
--- a/seahub/templates/sysadmin/sys_trafficadmin.html
+++ b/seahub/templates/sysadmin/sys_trafficadmin.html
@@ -16,13 +16,13 @@
 
 <ul class="traffic-tab-nav">
     <li class="tab">
-        <a href="{% url 'sys_statistic_traffic' %}" class="a">{% trans "System" context "system traffic" %}</a>
+        <a href="{% url 'sys_statistic_traffic' %}" class="a">{% trans "System" %}</a>
     </li>
     <li class="tab {% if type == 'user' %}tab-cur{% endif %}">
-        <a href="?type=user" class="a">{% trans "Users" context "user traffic" %}</a>
+        <a href="?type=user" class="a">{% trans "Users" %}</a>
     </li>
     <li class="tab {% if type == 'org' %}tab-cur{% endif %}">
-        <a href="?type=org" class="a">{% trans "Organizations" context "organization traffic" %}</a>
+        <a href="?type=org" class="a">{% trans "Organizations" %}</a>
     </li>
 </ul>
 
@@ -85,10 +85,12 @@
         {% for info in traffic_info_list %}
         <tr>
             <td>
-                {% if info.user %}
-                <a href="{% url 'user_info' info.user %}">{{ info.user }}</a>
-                {% else%}
+                {% if info.org_id > 0 %}
                 <a href="{% url 'sys_org_info_user' info.org_id %}">{{ info.org_name }}</a>
+                {% elif info.user %}
+                <a href="{% url 'user_info' info.user %}">{{ info.user|email2nickname }}</a>
+                {% else %}
+                --
                 {% endif %}
             </td>
             <td>{{ info.sync_file_upload|filesizeformat }}</td>
diff --git a/seahub/utils/__init__.py b/seahub/utils/__init__.py
index 8694754ab5..7045f6a953 100644
--- a/seahub/utils/__init__.py
+++ b/seahub/utils/__init__.py
@@ -1201,7 +1201,7 @@ def user_traffic_over_limit(username):
     traffic_limit = int(PLAN[plan]['share_link_traffic']) * 1024 * 1024 * 1024
 
     try:
-        stat = get_user_traffic_stat(username)
+        stat = seafevents_api.get_user_traffic_by_month(username, datetime.now())
     except Exception as e:
         logger = logging.getLogger(__name__)
         logger.error('Failed to get user traffic stat: %s' % username,
@@ -1211,7 +1211,7 @@ def user_traffic_over_limit(username):
     if stat is None:            # No traffic record yet
         return False
 
-    month_traffic = stat['file_view'] + stat['file_download'] + stat['dir_download']
+    month_traffic = stat['link_file_upload'] + stat['link_file_download']
     return True if month_traffic >= traffic_limit else False
 
 def is_user_password_strong(password):