diff --git a/frontend/src/components/dialog/transfer-dialog.js b/frontend/src/components/dialog/transfer-dialog.js index 388c7e817f..78759ead75 100644 --- a/frontend/src/components/dialog/transfer-dialog.js +++ b/frontend/src/components/dialog/transfer-dialog.js @@ -53,29 +53,31 @@ class TransferDialog extends React.Component { }; componentDidMount() { - if (this.props.isOrgAdmin) { - orgAdminAPI.orgAdminListDepartments(orgID).then((res) => { - this.updateOptions(res); - }).catch(error => { - let errMessage = Utils.getErrorMsg(error); - toaster.danger(errMessage); - }); - } - else if (this.props.isSysAdmin) { - systemAdminAPI.sysAdminListDepartments().then((res) => { - this.updateOptions(res); - }).catch(error => { - let errMessage = Utils.getErrorMsg(error); - toaster.danger(errMessage); - }); - } - else if (isPro) { - seafileAPI.listDepartments().then((res) => { - this.updateOptions(res); - }).catch(error => { - let errMessage = Utils.getErrorMsg(error); - toaster.danger(errMessage); - }); + if (isPro) { + if (this.props.isOrgAdmin) { + orgAdminAPI.orgAdminListDepartments(orgID).then((res) => { + this.updateOptions(res); + }).catch(error => { + let errMessage = Utils.getErrorMsg(error); + toaster.danger(errMessage); + }); + } + else if (this.props.isSysAdmin) { + systemAdminAPI.sysAdminListDepartments().then((res) => { + this.updateOptions(res); + }).catch(error => { + let errMessage = Utils.getErrorMsg(error); + toaster.danger(errMessage); + }); + } + else { + seafileAPI.listDepartments().then((res) => { + this.updateOptions(res); + }).catch(error => { + let errMessage = Utils.getErrorMsg(error); + toaster.danger(errMessage); + }); + } } } 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 29ceaff3c8..7ba3edfc6c 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 @@ -230,11 +230,11 @@ class SharedRepoListItem extends React.Component { this.setState({ isTransferDialogShow: !this.state.isTransferDialogShow }); }; - onTransferRepo = (user, reshare) => { + onTransferRepo = (email, reshare) => { let repoID = this.props.repo.repo_id; let groupID = this.props.currentGroup.id; - userAPI.depAdminTransferRepo(repoID, groupID, user.email, reshare).then(res => { - this.props.onTransferRepo(repoID, groupID, user.email); + userAPI.depAdminTransferRepo(repoID, groupID, email, reshare).then(res => { + this.props.onTransferRepo(repoID, groupID, email); let message = gettext('Successfully transferred the library.'); toaster.success(message); }).catch(error => { diff --git a/frontend/src/pages/org-admin/libraries/org-all-repos.js b/frontend/src/pages/org-admin/libraries/org-all-repos.js index ed56e51097..2b8d78c85b 100644 --- a/frontend/src/pages/org-admin/libraries/org-all-repos.js +++ b/frontend/src/pages/org-admin/libraries/org-all-repos.js @@ -212,10 +212,11 @@ class RepoItem extends React.Component { this.setState({ isTransferDialogShow: !this.state.isTransferDialogShow }); }; - onTransferRepo = (user, reshare) => { + onTransferRepo = (email, reshare) => { let repo = this.props.repo; - orgAdminAPI.orgAdminTransferOrgRepo(orgID, repo.repoID, user.email, reshare).then(res => { - this.props.transferRepoItem(repo.repoID, user); + orgAdminAPI.orgAdminTransferOrgRepo(orgID, repo.repoID, email, reshare).then(res => { + const { owner_name, owner_email } = res; + this.props.transferRepoItem(repo.repoID, owner_name, owner_email); let msg = gettext('Successfully transferred the library.'); toaster.success(msg); }).catch(error => { @@ -371,12 +372,12 @@ class OrgAllRepos extends Component { }); }; - transferRepoItem = (repoID, user) => { + transferRepoItem = (repoID, ownerName, ownerEmail) => { this.setState({ repos: this.state.repos.map(item => { if (item.repoID == repoID) { - item.ownerEmail = user.email; - item.ownerName = user.value; + item.ownerEmail = ownerEmail; + item.ownerName = ownerName; } return item; }) diff --git a/frontend/src/pages/sys-admin/repos/repos.js b/frontend/src/pages/sys-admin/repos/repos.js index c88299084a..d34ce0b86e 100644 --- a/frontend/src/pages/sys-admin/repos/repos.js +++ b/frontend/src/pages/sys-admin/repos/repos.js @@ -171,8 +171,8 @@ class Item extends Component { }); }; - onTransferRepo = (owner, reshare) => { - systemAdminAPI.sysAdminTransferRepo(this.props.repo.id, owner.email, reshare).then((res) => { + onTransferRepo = (email, reshare) => { + systemAdminAPI.sysAdminTransferRepo(this.props.repo.id, email, reshare).then((res) => { this.props.onTransferRepo(res.data); let message = gettext('Successfully transferred the library.'); toaster.success(message);