haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 14:50:29 +00:00
Code Issues Releases Wiki Activity

[sys] Update traffic admin and user_traffic_over_limit func

Browse Source
This commit is contained in:
zhengxie
2018-09-27 15:23:55 +08:00
parent 0620273992
commit b6abdd6132
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
seahub/templates/sysadmin/sys_statistic_traffic.html
View File

@@ -19,13 +19,13 @@
<ul class="traffic-tab-nav"> <ul class="traffic-tab-nav">
<li class="tab tab-cur"> <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>
<li class="tab"> <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>
<li class="tab"> <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> </li>
</ul> </ul>

14
seahub/templates/sysadmin/sys_trafficadmin.html
View File

@@ -16,13 +16,13 @@
<ul class="traffic-tab-nav"> <ul class="traffic-tab-nav">
<li class="tab"> <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>
<li class="tab {% if type == 'user' %}tab-cur{% endif %}"> <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>
<li class="tab {% if type == 'org' %}tab-cur{% endif %}"> <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> </li>
</ul> </ul>
@@ -85,10 +85,12 @@
{% for info in traffic_info_list %} {% for info in traffic_info_list %}
<tr> <tr>
<td> <td>
{% if info.user %} {% if info.org_id > 0 %}
<a href="{% url 'user_info' info.user %}">{{ info.user }}</a>
{% else%}
<a href="{% url 'sys_org_info_user' info.org_id %}">{{ info.org_name }}</a> <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 %} {% endif %}
</td> </td>
<td>{{ info.sync_file_upload|filesizeformat }}</td> <td>{{ info.sync_file_upload|filesizeformat }}</td>

4
seahub/utils/__init__.py
View File

@@ -1201,7 +1201,7 @@ def user_traffic_over_limit(username):
traffic_limit = int(PLAN[plan]['share_link_traffic']) * 1024 * 1024 * 1024 traffic_limit = int(PLAN[plan]['share_link_traffic']) * 1024 * 1024 * 1024
try: try:
stat = get_user_traffic_stat(username) stat = seafevents_api.get_user_traffic_by_month(username, datetime.now())
except Exception as e: except Exception as e:
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logger.error('Failed to get user traffic stat: %s' % username, 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 if stat is None: # No traffic record yet
return False 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 return True if month_traffic >= traffic_limit else False
def is_user_password_strong(password): def is_user_password_strong(password):