haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-06 09:21:54 +00:00
Code Issues Releases Wiki Activity

Fix load departments in not Pro (#7333)

Browse Source 
* 01 fix only isPro load departments

* 02 fix transfer repo
This commit is contained in:
Michael An
2025-01-08 15:58:05 +08:00
committed by GitHub
parent 5a8c9149b9
commit d1e0347194
4 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
frontend/src/components/dialog/transfer-dialog.js
View File

@@ -53,29 +53,31 @@ class TransferDialog extends React.Component {
}; };
componentDidMount() { componentDidMount() {
if (this.props.isOrgAdmin) { if (isPro) {
orgAdminAPI.orgAdminListDepartments(orgID).then((res) => { if (this.props.isOrgAdmin) {
this.updateOptions(res); orgAdminAPI.orgAdminListDepartments(orgID).then((res) => {
}).catch(error => { this.updateOptions(res);
let errMessage = Utils.getErrorMsg(error); }).catch(error => {
toaster.danger(errMessage); let errMessage = Utils.getErrorMsg(error);
}); toaster.danger(errMessage);
} });
else if (this.props.isSysAdmin) { }
systemAdminAPI.sysAdminListDepartments().then((res) => { else if (this.props.isSysAdmin) {
this.updateOptions(res); systemAdminAPI.sysAdminListDepartments().then((res) => {
}).catch(error => { this.updateOptions(res);
let errMessage = Utils.getErrorMsg(error); }).catch(error => {
toaster.danger(errMessage); let errMessage = Utils.getErrorMsg(error);
}); toaster.danger(errMessage);
} });
else if (isPro) { }
seafileAPI.listDepartments().then((res) => { else {
this.updateOptions(res); seafileAPI.listDepartments().then((res) => {
}).catch(error => { this.updateOptions(res);
let errMessage = Utils.getErrorMsg(error); }).catch(error => {
toaster.danger(errMessage); let errMessage = Utils.getErrorMsg(error);
}); toaster.danger(errMessage);
});
}
} }
} }

6
frontend/src/components/shared-repo-list-view/shared-repo-list-item.js
View File

@@ -230,11 +230,11 @@ class SharedRepoListItem extends React.Component {
this.setState({ isTransferDialogShow: !this.state.isTransferDialogShow }); this.setState({ isTransferDialogShow: !this.state.isTransferDialogShow });
}; };
onTransferRepo = (user, reshare) => { onTransferRepo = (email, reshare) => {
let repoID = this.props.repo.repo_id; let repoID = this.props.repo.repo_id;
let groupID = this.props.currentGroup.id; let groupID = this.props.currentGroup.id;
userAPI.depAdminTransferRepo(repoID, groupID, user.email, reshare).then(res => { userAPI.depAdminTransferRepo(repoID, groupID, email, reshare).then(res => {
this.props.onTransferRepo(repoID, groupID, user.email); this.props.onTransferRepo(repoID, groupID, email);
let message = gettext('Successfully transferred the library.'); let message = gettext('Successfully transferred the library.');
toaster.success(message); toaster.success(message);
}).catch(error => { }).catch(error => {

13
frontend/src/pages/org-admin/libraries/org-all-repos.js
View File

@@ -212,10 +212,11 @@ class RepoItem extends React.Component {
this.setState({ isTransferDialogShow: !this.state.isTransferDialogShow }); this.setState({ isTransferDialogShow: !this.state.isTransferDialogShow });
}; };
onTransferRepo = (user, reshare) => { onTransferRepo = (email, reshare) => {
let repo = this.props.repo; let repo = this.props.repo;
orgAdminAPI.orgAdminTransferOrgRepo(orgID, repo.repoID, user.email, reshare).then(res => { orgAdminAPI.orgAdminTransferOrgRepo(orgID, repo.repoID, email, reshare).then(res => {
this.props.transferRepoItem(repo.repoID, user); const { owner_name, owner_email } = res;
this.props.transferRepoItem(repo.repoID, owner_name, owner_email);
let msg = gettext('Successfully transferred the library.'); let msg = gettext('Successfully transferred the library.');
toaster.success(msg); toaster.success(msg);
}).catch(error => { }).catch(error => {
@@ -371,12 +372,12 @@ class OrgAllRepos extends Component {
}); });
}; };
transferRepoItem = (repoID, user) => { transferRepoItem = (repoID, ownerName, ownerEmail) => {
this.setState({ this.setState({
repos: this.state.repos.map(item => { repos: this.state.repos.map(item => {
if (item.repoID == repoID) { if (item.repoID == repoID) {
item.ownerEmail = user.email; item.ownerEmail = ownerEmail;
item.ownerName = user.value; item.ownerName = ownerName;
} }
return item; return item;
}) })

4
frontend/src/pages/sys-admin/repos/repos.js
View File

@@ -171,8 +171,8 @@ class Item extends Component {
}); });
}; };
onTransferRepo = (owner, reshare) => { onTransferRepo = (email, reshare) => {
systemAdminAPI.sysAdminTransferRepo(this.props.repo.id, owner.email, reshare).then((res) => { systemAdminAPI.sysAdminTransferRepo(this.props.repo.id, email, reshare).then((res) => {
this.props.onTransferRepo(res.data); this.props.onTransferRepo(res.data);
let message = gettext('Successfully transferred the library.'); let message = gettext('Successfully transferred the library.');
toaster.success(message); toaster.success(message);