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

Merge branch '7.1' into master

Browse Source
This commit is contained in:
lian
2020-11-25 15:05:57 +08:00
parent 9c143c31b8 cae1204ab1
commit c0669d4ad8
32 changed files with 340 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/pages/sys-admin/invitations/invitations.js
View File

@@ -275,7 +275,7 @@ class Invitations extends Component {
deleteItemInBatch = () => {
seafileAPI.sysAdminDeleteExpiredInvitations().then(res => {
const prevItems = this.state.items;
const items = this.state.items.filter(item => !item.is_expired);
const items = this.state.items.filter(item => !item.is_expired || item.accept_time);
if (items.length < prevItems.length) {
this.setState({
items: items