From a3342df76a7a2843f3d845a16f3c42fc0f5be8d6 Mon Sep 17 00:00:00 2001 From: llj Date: Tue, 13 Oct 2020 11:45:08 +0800 Subject: [PATCH] [system admin] statistic/traffic: modified 'order_by' value according to python API, for sort of users/orgs traffic (#4691) --- .../src/pages/sys-admin/statistic/statistic-traffic-orgs.js | 2 +- .../src/pages/sys-admin/statistic/statistic-traffic-users.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/pages/sys-admin/statistic/statistic-traffic-orgs.js b/frontend/src/pages/sys-admin/statistic/statistic-traffic-orgs.js index 64204c8dbf..b155d96e82 100644 --- a/frontend/src/pages/sys-admin/statistic/statistic-traffic-orgs.js +++ b/frontend/src/pages/sys-admin/statistic/statistic-traffic-orgs.js @@ -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); diff --git a/frontend/src/pages/sys-admin/statistic/statistic-traffic-users.js b/frontend/src/pages/sys-admin/statistic/statistic-traffic-users.js index 8988c64887..8e8ad2cb5c 100644 --- a/frontend/src/pages/sys-admin/statistic/statistic-traffic-users.js +++ b/frontend/src/pages/sys-admin/statistic/statistic-traffic-users.js @@ -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: ''