diff --git a/frontend/src/pages/org-admin/org-links.js b/frontend/src/pages/org-admin/org-links.js index 12c7f0132d1..bc47635daf9 100644 --- a/frontend/src/pages/org-admin/org-links.js +++ b/frontend/src/pages/org-admin/org-links.js @@ -24,7 +24,7 @@ class OrgLinks extends React.Component { } listOrgLinks = (page) => { - seafileAPI.orgAdminListOrgLinks(this.state.page).then(res => { + seafileAPI.orgAdminListOrgLinks(page).then(res => { const data = res.data; this.setState({ linkList: data.link_list, @@ -45,7 +45,7 @@ class OrgLinks extends React.Component { onChangePageNum = (event, num) => { event.preventDefault(); let page = this.state.page; - if (num == 1) { + if (num === 1) { page = page + 1; } else { page = page - 1; @@ -122,8 +122,8 @@ class OrgLinks extends React.Component {
- {this.state.page != 1 && this.onChangePageNum(e, -1)}>{gettext('Previous')}} - {(this.state.page != 1 && this.state.pageNext) && | } + {this.state.page !== 1 && this.onChangePageNum(e, -1)}>{gettext('Previous')}} + {(this.state.page !== 1 && this.state.pageNext) && | } {this.state.pageNext && this.onChangePageNum(e, 1)}>{gettext('Next')}}
diff --git a/seahub/organizations/api/admin/links.py b/seahub/organizations/api/admin/links.py index 0fe52e9c829..aa92a4dad78 100644 --- a/seahub/organizations/api/admin/links.py +++ b/seahub/organizations/api/admin/links.py @@ -43,8 +43,7 @@ def get(self, request): offset = per_page * (current_page - 1) limit = per_page + 1 org_id = request.user.org.org_id - - ofs = OrgFileShare.objects.filter(org_id=org_id)[offset:offset + limit] + ofs = OrgFileShare.objects.filter(org_id=org_id).order_by('-file_share__ctime')[offset:offset + limit] publinks = [ x.file_share for x in ofs ] if len(publinks) == per_page + 1: