haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 19:08:21 +00:00
Code Issues Releases Wiki Activity

Merge branch '7.1' into master

Browse Source
This commit is contained in:
lian
2020-10-19 10:43:45 +08:00
parent 0bff0c1104 a3342df76a
commit 33a9849555
3 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/pages/sys-admin/statistic/statistic-traffic-orgs.js
View File

@@ -74,7 +74,7 @@ class OrgsTraffic extends React.Component {
getTrafficList = (month, page) => {
const { perPage, sortBy, sortOrder } = this.state;
const orderBy = `${sortBy}_${sortOrder}`;
const orderBy = sortOrder == 'asc' ? sortBy : `${sortBy}_${sortOrder}`;
this.setState({isLoading: true, errorMessage: ''});
seafileAPI.sysAdminListOrgTraffic(month, page, perPage, orderBy).then(res => {
let orgTrafficList = res.data.org_monthly_traffic_list.slice(0);

2
frontend/src/pages/sys-admin/statistic/statistic-traffic-users.js
View File

@@ -74,7 +74,7 @@ class UsersTraffic extends React.Component {
getTrafficList = (month, page) => {
const { perPage, sortBy, sortOrder } = this.state;
const orderBy = `${sortBy}_${sortOrder}`;
const orderBy = sortOrder == 'asc' ? sortBy : `${sortBy}_${sortOrder}`;
this.setState({
isLoading: true,
errorMessage: ''