From 31a5e955cc7c1b3547beb267a5041e1b51a100cb Mon Sep 17 00:00:00 2001 From: llj Date: Thu, 16 May 2019 17:28:04 +0800 Subject: [PATCH] [folder perm] added it for department repo --- .../dialog/lib-sub-folder-permission-dialog.js | 4 ++-- .../lib-sub-folder-set-group-permission-dialog.js | 14 +++++++------- .../lib-sub-folder-set-user-permission-dialog.js | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/frontend/src/components/dialog/lib-sub-folder-permission-dialog.js b/frontend/src/components/dialog/lib-sub-folder-permission-dialog.js index c6a8af7cf5..5c851bfc1b 100644 --- a/frontend/src/components/dialog/lib-sub-folder-permission-dialog.js +++ b/frontend/src/components/dialog/lib-sub-folder-permission-dialog.js @@ -53,10 +53,10 @@ class LibSubFolderPermissionDialog extends React.Component {
- + - +
diff --git a/frontend/src/components/dialog/lib-sub-folder-set-group-permission-dialog.js b/frontend/src/components/dialog/lib-sub-folder-set-group-permission-dialog.js index 79748f619a..f72f9520aa 100644 --- a/frontend/src/components/dialog/lib-sub-folder-set-group-permission-dialog.js +++ b/frontend/src/components/dialog/lib-sub-folder-set-group-permission-dialog.js @@ -71,7 +71,8 @@ class GroupItem extends React.Component { } const propTypes = { - repoID: PropTypes.string.isRequired + repoID: PropTypes.string.isRequired, + isDepartmentRepo: PropTypes.bool }; const NoOptionsMessage = (props) => { @@ -122,9 +123,8 @@ class LibSubFolderSerGroupPermissionDialog extends React.Component { } listGroupPermissionItems = () => { - let repoID = this.props.repoID; - let folderPath = this.props.folderPath; - seafileAPI.listGroupFolderPerm(repoID, folderPath).then((res) => { + const { isDepartmentRepo, repoID, folderPath } = this.props; + seafileAPI.listGroupFolderPerm(isDepartmentRepo, repoID, folderPath).then((res) => { if (res.data.length !== 0) { this.setState({ groupPermissionItems: res.data @@ -144,7 +144,7 @@ class LibSubFolderSerGroupPermissionDialog extends React.Component { return false; } - seafileAPI.addGroupFolderPerm(this.props.repoID, this.state.permission, folderPath, selectedOption.id).then(res => { + seafileAPI.addGroupFolderPerm(this.props.isDepartmentRepo, this.props.repoID, this.state.permission, folderPath, selectedOption.id).then(res => { let errorMsg = []; if (res.data.failed.length > 0) { for (let i = 0; i < res.data.failed.length; i++) { @@ -177,7 +177,7 @@ class LibSubFolderSerGroupPermissionDialog extends React.Component { } deleteGroupPermissionItem = (item) => { - seafileAPI.deleteGroupFolderPerm(item.repo_id, item.permission, item.folder_path, item.group_id).then(() => { + seafileAPI.deleteGroupFolderPerm(this.props.isDepartmentRepo, item.repo_id, item.permission, item.folder_path, item.group_id).then(() => { this.setState({ groupPermissionItems: this.state.groupPermissionItems.filter(deletedItem => { return deletedItem != item; }) }); @@ -185,7 +185,7 @@ class LibSubFolderSerGroupPermissionDialog extends React.Component { } onChangeGroupPermission = (item, permission) => { - seafileAPI.updateGroupFolderPerm(item.repo_id, permission, item.folder_path, item.group_id).then(() => { + seafileAPI.updateGroupFolderPerm(this.props.isDepartmentRepo, item.repo_id, permission, item.folder_path, item.group_id).then(() => { this.updateGroupPermission(item, permission); }); } diff --git a/frontend/src/components/dialog/lib-sub-folder-set-user-permission-dialog.js b/frontend/src/components/dialog/lib-sub-folder-set-user-permission-dialog.js index 5e50657e85..656912e5c0 100644 --- a/frontend/src/components/dialog/lib-sub-folder-set-user-permission-dialog.js +++ b/frontend/src/components/dialog/lib-sub-folder-set-user-permission-dialog.js @@ -72,7 +72,8 @@ class UserItem extends React.Component { const propTypes = { - repoID: PropTypes.string.isRequired + repoID: PropTypes.string.isRequired, + isDepartmentRepo: PropTypes.bool }; @@ -100,9 +101,8 @@ class LibSubFolderSetUserPermissionDialog extends React.Component { } componentDidMount() { - let repoID = this.props.repoID; - let folderPath = this.props.folderPath; - seafileAPI.listUserFolderPerm(repoID, folderPath).then((res) => { + const {repoID, folderPath, isDepartmentRepo} = this.props; + seafileAPI.listUserFolderPerm(isDepartmentRepo, repoID, folderPath).then((res) => { if (res.data.length !== 0) { this.setState({userFolderPermItems: res.data}); } @@ -121,7 +121,7 @@ class LibSubFolderSetUserPermissionDialog extends React.Component { } const users = selectedUsers.map((item, index) => item.email); - seafileAPI.addUserFolderPerm(this.props.repoID, this.state.permission, folderPath, users).then(res => { + seafileAPI.addUserFolderPerm(this.props.isDepartmentRepo, this.props.repoID, this.state.permission, folderPath, users).then(res => { let errorMsg = []; if (res.data.failed.length > 0) { for (let i = 0; i < res.data.failed.length; i++) { @@ -154,7 +154,7 @@ class LibSubFolderSetUserPermissionDialog extends React.Component { } deleteUserFolderPermItem = (item) => { - seafileAPI.deleteUserFolderPerm(item.repo_id, item.permission, item.folder_path, item.user_email).then(res => { + seafileAPI.deleteUserFolderPerm(this.props.isDepartmentRepo, item.repo_id, item.permission, item.folder_path, item.user_email).then(res => { this.setState({ userFolderPermItems: this.state.userFolderPermItems.filter(deletedItem => { return deletedItem != item; @@ -164,7 +164,7 @@ class LibSubFolderSetUserPermissionDialog extends React.Component { } onChangeUserFolderPerm = (repoID, permission, folderPath, userEmail) => { - seafileAPI.updateUserFolderPerm(repoID, permission, folderPath, userEmail).then(res => { + seafileAPI.updateUserFolderPerm(this.props.isDepartmentRepo, repoID, permission, folderPath, userEmail).then(res => { let userFolderPermItems = this.state.userFolderPermItems.map(item => { if (item.user_email === userEmail && item.folder_path === folderPath) { item.permission = permission;