1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 10:26:17 +00:00

Merge branch 'master' into 12.0

This commit is contained in:
杨顺强
2024-05-30 14:49:13 +08:00
506 changed files with 96391 additions and 126189 deletions

View File

@@ -77,11 +77,8 @@ class GroupItem extends React.Component {
GroupItem.propTypes = {
item: PropTypes.object.isRequired,
permissions: PropTypes.array.isRequired,
deleteUserFolderPermission: PropTypes.func.isRequired,
onChangeUserFolderPerm: PropTypes.func.isRequired,
showPath: PropTypes.bool.isRequired,
repoName: PropTypes.string.isRequired,
handleChange: PropTypes.func.isRequired,
deleteGroupPermissionItem: PropTypes.func.isRequired,
onChangeGroupPermission: PropTypes.func.isRequired,
};
@@ -247,6 +244,7 @@ class LibSubFolderSetGroupPermissionDialog extends React.Component {
handleSubmit = () => {
this.setState({
folderPath: this.state.folderPath || '/',
showFileChooser: !this.state.showFileChooser
});
};

View File

@@ -82,14 +82,13 @@ UserItem.propTypes = {
onChangeUserFolderPerm: PropTypes.func.isRequired,
showPath: PropTypes.bool.isRequired,
repoName: PropTypes.string.isRequired,
handleChange: PropTypes.func.isRequired,
};
const propTypes = {
repoID: PropTypes.string.isRequired,
isDepartmentRepo: PropTypes.bool,
folderPath: PropTypes.string.isRequired,
folderPath: PropTypes.string,
repoName: PropTypes.string,
};
@@ -226,6 +225,7 @@ class LibSubFolderSetUserPermissionDialog extends React.Component {
handleFileChooserSubmit = () => {
this.setState({
folderPath: this.state.folderPath || '/',
showFileChooser: !this.state.showFileChooser
});
};