mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-04 08:28:11 +00:00
Merge branch '11.0'
This commit is contained in:
@@ -50,6 +50,7 @@ class GroupItem extends React.Component {
|
||||
currentPermission={currentPermission}
|
||||
permissions={this.props.permissions}
|
||||
onPermissionChanged={this.onChangeUserPermission}
|
||||
isSysAdmin={true}
|
||||
/>
|
||||
</td>
|
||||
<td>
|
||||
@@ -262,6 +263,7 @@ class SysAdminShareToGroup extends React.Component {
|
||||
currentPermission={this.state.permission}
|
||||
permissions={this.permissions}
|
||||
onPermissionChanged={this.setPermission}
|
||||
isSysAdmin={true}
|
||||
/>
|
||||
</td>
|
||||
<td>
|
||||
|
@@ -50,6 +50,7 @@ class UserItem extends React.Component {
|
||||
currentPermission={currentPermission}
|
||||
permissions={this.props.permissions}
|
||||
onPermissionChanged={this.onChangeUserPermission}
|
||||
isSysAdmin={true}
|
||||
/>
|
||||
</td>
|
||||
<td>
|
||||
@@ -248,6 +249,7 @@ class SysAdminShareToUser extends React.Component {
|
||||
currentPermission={this.state.permission}
|
||||
permissions={this.permissions}
|
||||
onPermissionChanged={this.setPermission}
|
||||
isSysAdmin={true}
|
||||
/>
|
||||
</td>
|
||||
<td>
|
||||
|
@@ -19,6 +19,7 @@ const propTypes = {
|
||||
onPermissionChanged: PropTypes.func.isRequired,
|
||||
enableAddCustomPermission: PropTypes.bool,
|
||||
onAddCustomPermissionToggle: PropTypes.func,
|
||||
isSysAdmin: PropTypes.bool,
|
||||
};
|
||||
|
||||
class SharePermissionEditor extends React.Component {
|
||||
@@ -56,7 +57,14 @@ class SharePermissionEditor extends React.Component {
|
||||
}
|
||||
|
||||
listCustomPermissions = () => {
|
||||
const { repoID } = this.props;
|
||||
const { repoID, isSysAdmin } = this.props;
|
||||
if (isSysAdmin) {
|
||||
this.setState({
|
||||
isLoading: false,
|
||||
customPermissions: []
|
||||
});
|
||||
return;
|
||||
}
|
||||
const cacheData = localStorage.getItem(this.CACHE_KEY);
|
||||
if (cacheData) {
|
||||
const { permission_list: permissions } = JSON.parse(cacheData);
|
||||
|
Reference in New Issue
Block a user