haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-08 02:23:44 +00:00
Code Issues Releases Wiki Activity

[system admin / org admin] 'delete department' dialog: fixup & improvement (#4532)

Browse Source
This commit is contained in:
llj 2020-04-15 15:32:05 +08:00 committed by GitHub
parent 96bc07526b
commit 7600d20c1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
frontend/src/components/dialog/org-delete-department-dialog.js
View File

@ -4,6 +4,7 @@ import { Button, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
import { gettext, orgID } from '../../utils/constants'; import { gettext, orgID } from '../../utils/constants';
import { seafileAPI } from '../../utils/seafile-api'; import { seafileAPI } from '../../utils/seafile-api';
import { Utils } from '../../utils/utils'; import { Utils } from '../../utils/utils';
import toaster from '../../components/toast';
const propTypes = { const propTypes = {
groupName: PropTypes.string, groupName: PropTypes.string,
@ -16,19 +17,15 @@ class DeleteDepartDialog extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = {
errMessage: null
};
} }
deleteDepart = () => { deleteDepart = () => {
this.props.toggle();
seafileAPI.orgAdminDeleteDepartGroup(orgID, this.props.groupID).then((res) => { seafileAPI.orgAdminDeleteDepartGroup(orgID, this.props.groupID).then((res) => {
if (res.data.success) { this.props.onDepartChanged();
this.props.onDepartChanged(); }).catch(error => {
this.props.toggle(); let errMessage = Utils.getErrorMsg(error);
} toaster.danger(errMessage);
}).catch(err => {
this.setState({ errMessage: 'There are sub-departments in this department.' });
}); });
} }
@ -39,12 +36,11 @@ class DeleteDepartDialog extends React.Component {
<Modal isOpen={true} toggle={this.props.toggle}> <Modal isOpen={true} toggle={this.props.toggle}>
<ModalHeader toggle={this.props.toggle}>{gettext('Delete Department')}</ModalHeader> <ModalHeader toggle={this.props.toggle}>{gettext('Delete Department')}</ModalHeader>
<ModalBody> <ModalBody>
<div dangerouslySetInnerHTML={{__html: subtitle}}></div> <p dangerouslySetInnerHTML={{__html: subtitle}}></p>
{ this.state.errMessage && <p className="error">{this.state.errMessage}</p> }
</ModalBody> </ModalBody>
<ModalFooter> <ModalFooter>
{!this.state.errMessage && <Button color="primary" onClick={this.deleteDepart}>{gettext('Delete')}</Button>}
<Button color="secondary" onClick={this.props.toggle}>{gettext('Cancel')}</Button> <Button color="secondary" onClick={this.props.toggle}>{gettext('Cancel')}</Button>
<Button color="primary" onClick={this.deleteDepart}>{gettext('Delete')}</Button>
</ModalFooter> </ModalFooter>
</Modal> </Modal>
); );

20
frontend/src/components/dialog/sysadmin-dialog/sysadmin-delete-department-dialog.js
View File

@ -4,6 +4,7 @@ import { Button, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
import { gettext } from '../../../utils/constants'; import { gettext } from '../../../utils/constants';
import { seafileAPI } from '../../../utils/seafile-api'; import { seafileAPI } from '../../../utils/seafile-api';
import { Utils } from '../../../utils/utils'; import { Utils } from '../../../utils/utils';
import toaster from '../../../components/toast';
const propTypes = { const propTypes = {
groupName: PropTypes.string, groupName: PropTypes.string,
@ -16,19 +17,15 @@ class DeleteDepartDialog extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = {
errMessage: null
};
} }
deleteDepart = () => { deleteDepart = () => {
this.props.toggle();
seafileAPI.sysAdminDeleteDepartment(this.props.groupID).then((res) => { seafileAPI.sysAdminDeleteDepartment(this.props.groupID).then((res) => {
if (res.data.success) { this.props.onDepartChanged();
this.props.onDepartChanged(); }).catch(error => {
this.props.toggle(); let errMessage = Utils.getErrorMsg(error);
} toaster.danger(errMessage);
}).catch(err => {
this.setState({ errMessage: 'There are sub-departments in this department.' });
}); });
} }
@ -39,12 +36,11 @@ class DeleteDepartDialog extends React.Component {
<Modal isOpen={true} toggle={this.props.toggle}> <Modal isOpen={true} toggle={this.props.toggle}>
<ModalHeader toggle={this.props.toggle}>{gettext('Delete Department')}</ModalHeader> <ModalHeader toggle={this.props.toggle}>{gettext('Delete Department')}</ModalHeader>
<ModalBody> <ModalBody>
<div dangerouslySetInnerHTML={{__html: tipMessage}}></div> <p dangerouslySetInnerHTML={{__html: tipMessage}}></p>
{ this.state.errMessage && <p className="error">{this.state.errMessage}</p> }
</ModalBody> </ModalBody>
<ModalFooter> <ModalFooter>
{!this.state.errMessage && <Button color="primary" onClick={this.deleteDepart}>{gettext('Delete')}</Button>}
<Button color="secondary" onClick={this.props.toggle}>{gettext('Cancel')}</Button> <Button color="secondary" onClick={this.props.toggle}>{gettext('Cancel')}</Button>
<Button color="primary" onClick={this.deleteDepart}>{gettext('Delete')}</Button>
</ModalFooter> </ModalFooter>
</Modal> </Modal>
); );

4
seahub/api2/endpoints/admin/address_book/groups.py
View File

@ -229,11 +229,11 @@ class AdminAddressBookGroup(APIView):
if has_repo: if has_repo:
error_msg = _('There are libraries in this department.') error_msg = _('There are libraries in this department.')
return api_error(status.HTTP_403_FORBIDDEN, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
if len(child_groups) > 0: if len(child_groups) > 0:
error_msg = _('There are sub-departments in this department.') error_msg = _('There are sub-departments in this department.')
return api_error(status.HTTP_403_FORBIDDEN, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
try: try:
ret_code = ccnet_api.remove_group(group_id) ret_code = ccnet_api.remove_group(group_id)