From 256b1ec70dc4a708a91a3386e8067f5ecfa1a68e Mon Sep 17 00:00:00 2001 From: awu0403 <76416779+awu0403@users.noreply.github.com> Date: Tue, 14 Jan 2025 13:55:18 +0800 Subject: [PATCH] fix admin delete repo (#7352) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix admin delete repo * delete useless codes --------- Co-authored-by: 孙永强 <11704063+s-yongqiang@user.noreply.gitee.com> Co-authored-by: Michael An <2331806369@qq.com> --- frontend/src/components/dialog/delete-repo-dialog.js | 12 +++++++----- .../shared-repo-list-view/shared-repo-list-item.js | 1 + frontend/src/pages/my-libs/mylib-repo-list-item.js | 1 + frontend/src/pages/org-admin/org-group-repos.js | 1 + frontend/src/pages/org-admin/org-user-repos.js | 1 + frontend/src/pages/sys-admin/repos/repos.js | 1 + 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/dialog/delete-repo-dialog.js b/frontend/src/components/dialog/delete-repo-dialog.js index 90b6c9b6c8..1d499fda7c 100644 --- a/frontend/src/components/dialog/delete-repo-dialog.js +++ b/frontend/src/components/dialog/delete-repo-dialog.js @@ -31,12 +31,14 @@ class DeleteRepoDialog extends Component { } componentDidMount() { - seafileAPI.getRepoFolderShareInfo(this.props.repo.id).then((res) => { - this.setState({ - sharedToUserCount: res.data['shared_user_emails'].length, - sharedToGroupCount: res.data['shared_group_ids'].length, + if (this.props.isGetShare) { + seafileAPI.getRepoFolderShareInfo(this.props.repo.repo_id).then((res) => { + this.setState({ + sharedToUserCount: res.data['shared_user_emails'].length, + sharedToGroupCount: res.data['shared_group_ids'].length, + }); }); - }); + } } onDeleteRepo = () => { diff --git a/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js b/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js index 7ba3edfc6c..a3bb9d7ad0 100644 --- a/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js +++ b/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js @@ -771,6 +771,7 @@ class SharedRepoListItem extends React.Component { isRepoDeleted={this.state.isRepoDeleted} onDeleteRepo={this.onItemDelete} toggle={this.onItemDeleteToggle} + isGetShare={true} /> } diff --git a/frontend/src/pages/my-libs/mylib-repo-list-item.js b/frontend/src/pages/my-libs/mylib-repo-list-item.js index a931b18ff5..65efbf1791 100644 --- a/frontend/src/pages/my-libs/mylib-repo-list-item.js +++ b/frontend/src/pages/my-libs/mylib-repo-list-item.js @@ -505,6 +505,7 @@ class MylibRepoListItem extends React.Component { isRepoDeleted={this.state.isRepoDeleted} onDeleteRepo={this.onDeleteRepo} toggle={this.onDeleteToggle} + isGetShare={true} /> )} diff --git a/frontend/src/pages/org-admin/org-group-repos.js b/frontend/src/pages/org-admin/org-group-repos.js index 334be1203d..5ffe7e6e62 100644 --- a/frontend/src/pages/org-admin/org-group-repos.js +++ b/frontend/src/pages/org-admin/org-group-repos.js @@ -180,6 +180,7 @@ class Item extends Component { isRepoDeleted={this.state.isRepoDeleted} onDeleteRepo={this.deleteRepo} toggle={this.toggleDeleteRepoDialog} + isGetShare={false} /> )} diff --git a/frontend/src/pages/org-admin/org-user-repos.js b/frontend/src/pages/org-admin/org-user-repos.js index 9372183db7..81e5b207b4 100644 --- a/frontend/src/pages/org-admin/org-user-repos.js +++ b/frontend/src/pages/org-admin/org-user-repos.js @@ -176,6 +176,7 @@ class Item extends Component { isRepoDeleted={this.state.isRepoDeleted} onDeleteRepo={this.deleteRepo} toggle={this.toggleDeleteRepoDialog} + isGetShare={false} /> )} diff --git a/frontend/src/pages/sys-admin/repos/repos.js b/frontend/src/pages/sys-admin/repos/repos.js index d34ce0b86e..5ccbfbbb98 100644 --- a/frontend/src/pages/sys-admin/repos/repos.js +++ b/frontend/src/pages/sys-admin/repos/repos.js @@ -371,6 +371,7 @@ class Item extends Component { isRepoDeleted={this.state.isRepoDeleted} onDeleteRepo={this.onDeleteRepo} toggle={this.toggleDeleteDialog} + isGetShare={false} /> }