fix: 修复全局组织下更新、删除：用户、端点、端点规则、组织权限

jumpserver · Sep 26, 2022 · c599a6a · c599a6a
1 parent 7f34195
commit c599a6a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/src/views/settings/Org/OrganizationList.vue b/src/views/settings/Org/OrganizationList.vue
@@ -60,6 +60,7 @@ export default {
           actions: {
             prop: 'id',
             formatterArgs: {
+              canUpdate: this.$hasPerm('orgs.change_organization'),
               canDelete: function({ row }) {
                 return !row.is_default && vm.$hasPerm('orgs.delete_organization')
               },

diff --git a/src/views/settings/Terminal/Endpoint/EndpointList.vue b/src/views/settings/Terminal/Endpoint/EndpointList.vue
@@ -39,9 +39,10 @@ export default {
           },
           actions: {
             formatterArgs: {
+              canUpdate: this.$hasPerm('terminal.change_endpoint'),
               updateRoute: 'EndpointUpdate',
               cloneRoute: 'EndpointCreate',
-              canDelete: ({ row }) => row.id !== '00000000-0000-0000-0000-000000000001'
+              canDelete: ({ row }) => row.id !== '00000000-0000-0000-0000-000000000001' && this.$hasPerm('terminal.delete_endpoint')
             }
           }
         }

diff --git a/src/views/settings/Terminal/EndpointRule/EndpointRuleList.vue b/src/views/settings/Terminal/EndpointRule/EndpointRuleList.vue
@@ -38,6 +38,7 @@ export default {
           },
           actions: {
             formatterArgs: {
+              canUpdate: this.$hasPerm('terminal.change_endpointrule'),
               updateRoute: 'EndpointRuleUpdate',
               cloneRoute: 'EndpointRuleCreate'
             }

diff --git a/src/views/users/User/UserList.vue b/src/views/users/User/UserList.vue
@@ -115,6 +115,7 @@ export default {
           actions: {
             formatterArgs: {
               hasDelete: hasDelete,
+              canUpdate: this.$hasPerm('users.change_user'),
               extraActions: [
                 {
                   title: this.$t('users.Remove'),