From a2cd02f007d4c5a0ff6692173f39f71b7517acd6 Mon Sep 17 00:00:00 2001 From: Ranjiwei <32759763+r350178982@users.noreply.github.com> Date: Wed, 21 Aug 2024 18:08:34 +0800 Subject: [PATCH] Admin share permissions (#6603) * update * update * update * Update urls.py * Update share-permission-editor.js --- .../dialog/sysadmin-dialog/sysadmin-share-to-group.js | 2 ++ .../dialog/sysadmin-dialog/sysadmin-share-to-user.js | 2 ++ .../select-editor/share-permission-editor.js | 10 +++++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-share-to-group.js b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-share-to-group.js index 29d710b199..89d32f4811 100644 --- a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-share-to-group.js +++ b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-share-to-group.js @@ -50,6 +50,7 @@ class GroupItem extends React.Component { currentPermission={currentPermission} permissions={this.props.permissions} onPermissionChanged={this.onChangeUserPermission} + isSysAdmin={true} /> @@ -262,6 +263,7 @@ class SysAdminShareToGroup extends React.Component { currentPermission={this.state.permission} permissions={this.permissions} onPermissionChanged={this.setPermission} + isSysAdmin={true} /> diff --git a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-share-to-user.js b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-share-to-user.js index 61eb470627..a2c330312a 100644 --- a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-share-to-user.js +++ b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-share-to-user.js @@ -50,6 +50,7 @@ class UserItem extends React.Component { currentPermission={currentPermission} permissions={this.props.permissions} onPermissionChanged={this.onChangeUserPermission} + isSysAdmin={true} /> @@ -249,6 +250,7 @@ class SysAdminShareToUser extends React.Component { currentPermission={this.state.permission} permissions={this.permissions} onPermissionChanged={this.setPermission} + isSysAdmin={true} /> diff --git a/frontend/src/components/select-editor/share-permission-editor.js b/frontend/src/components/select-editor/share-permission-editor.js index 8b6c3b4bab..49e67da0d4 100644 --- a/frontend/src/components/select-editor/share-permission-editor.js +++ b/frontend/src/components/select-editor/share-permission-editor.js @@ -18,6 +18,7 @@ const propTypes = { onPermissionChanged: PropTypes.func.isRequired, enableAddCustomPermission: PropTypes.bool, onAddCustomPermissionToggle: PropTypes.func, + isSysAdmin: PropTypes.bool, }; class SharePermissionEditor extends React.Component { @@ -55,7 +56,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);