From df228f525619a00bd72140af4f87152cd2ef962f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Mon, 14 Mar 2022 20:26:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BD=9C=E4=B8=9A?=
=?UTF-8?q?=E4=B8=AD=E5=BF=83-=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=9D=83=E9=99=90=E4=B8=8D=E5=87=86=E7=A1=AE?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/console/ops.js | 13 +++++++++++--
src/views/ops/TaskDetail/TaskDetail.vue | 3 +++
src/views/ops/TaskDetail/index.vue | 4 ++--
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/router/console/ops.js b/src/router/console/ops.js
index 7cafec880..1f0b077bf 100644
--- a/src/router/console/ops.js
+++ b/src/router/console/ops.js
@@ -28,14 +28,22 @@ export default [
component: () => import('@/views/ops/TaskDetail/AdhocDetail'),
name: 'AdhocDetail',
hidden: true,
- meta: { title: i18n.t('route.TaskDetail'), activeMenu: '/console/ops/tasks' }
+ meta: {
+ title: i18n.t('route.TaskDetail'),
+ permissions: ['ops.view_adhoc'],
+ activeMenu: '/ops/tasks'
+ }
},
{
path: 'executions/:id',
component: () => import('@/views/ops/TaskDetail/HistoryExecutionDetail'),
name: 'HistoryExecutionDetail',
hidden: true,
- meta: { title: i18n.t('route.TaskDetail'), activeMenu: '/console/ops/tasks' }
+ meta: {
+ title: i18n.t('route.TaskDetail'),
+ permissions: ['ops.view_adhocexecution'],
+ activeMenu: '/console/ops/tasks'
+ }
},
{
path: 'command-executions/create',
@@ -43,6 +51,7 @@ export default [
component: () => import('@/views/ops/CommandExecution'),
meta: {
title: i18n.t('route.BatchCommand'),
+ permissions: ['ops.add_adhocexecution'],
hidden: ({ settings }) => !settings['SECURITY_COMMAND_EXECUTION']
}
},
diff --git a/src/views/ops/TaskDetail/TaskDetail.vue b/src/views/ops/TaskDetail/TaskDetail.vue
index 15917f1ac..53deb212d 100644
--- a/src/views/ops/TaskDetail/TaskDetail.vue
+++ b/src/views/ops/TaskDetail/TaskDetail.vue
@@ -67,6 +67,9 @@ export default {
value: this.object.latest_execution,
formatter: function(row, data) {
const route = { to: { name: 'AdhocDetail', params: { id: data.adhoc }}}
+ if (!this.$hasPerm('ops.ops.view_adhoc')) {
+ return { data.adhoc_short_id }
+ }
return { data.adhoc_short_id }
}
},
diff --git a/src/views/ops/TaskDetail/index.vue b/src/views/ops/TaskDetail/index.vue
index fde7ad9f6..8d80537de 100644
--- a/src/views/ops/TaskDetail/index.vue
+++ b/src/views/ops/TaskDetail/index.vue
@@ -34,12 +34,12 @@ export default {
{
title: this.$t('ops.taskVersions'),
name: 'TaskAdhoc',
- hidden: () => !this.$hasPerm('ops.view_task')
+ hidden: () => !this.$hasPerm('ops.view_adhoc')
},
{
title: this.$t('ops.execution'),
name: 'TaskHistory',
- hidden: () => !this.$hasPerm('ops.view_taskmonitor')
+ hidden: () => !this.$hasPerm('ops.view_adhocexecution')
}
],
hasRightSide: false