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