diff --git a/ui/app/components/task-group-row.js b/ui/app/components/task-group-row.js index 8f01fd05efd..57d9e9336ae 100644 --- a/ui/app/components/task-group-row.js +++ b/ui/app/components/task-group-row.js @@ -19,9 +19,14 @@ export default class TaskGroupRow extends Component { @oneWay('taskGroup.count') count; @alias('taskGroup.job.runningDeployment') runningDeployment; - @computed('runningDeployment') + get namespace() { + return this.get('taskGroup.job.namespace.name'); + } + + @computed('runningDeployment', 'namespace') get tooltipText() { - if (this.can.cannot('scale job')) return "You aren't allowed to scale task groups"; + if (this.can.cannot('scale job', null, { namespace: this.namespace })) + return "You aren't allowed to scale task groups"; if (this.runningDeployment) return 'You cannot scale task groups during a deployment'; return undefined; } diff --git a/ui/app/controllers/jobs/job/task-group.js b/ui/app/controllers/jobs/job/task-group.js index 8a86ddcf86f..a85c97d30b2 100644 --- a/ui/app/controllers/jobs/job/task-group.js +++ b/ui/app/controllers/jobs/job/task-group.js @@ -66,9 +66,10 @@ export default class TaskGroupController extends Controller.extend( }) shouldShowScaleEventTimeline; - @computed('model.job.runningDeployment') + @computed('model.job.{namespace,runningDeployment}') get tooltipText() { - if (this.can.cannot('scale job')) return "You aren't allowed to scale task groups"; + if (this.can.cannot('scale job', null, { namespace: this.model.job.namespace.get('name') })) + return "You aren't allowed to scale task groups"; if (this.model.job.runningDeployment) return 'You cannot scale task groups during a deployment'; return undefined; } diff --git a/ui/app/routes/jobs/run.js b/ui/app/routes/jobs/run.js index ee72d95fbe9..2111e133483 100644 --- a/ui/app/routes/jobs/run.js +++ b/ui/app/routes/jobs/run.js @@ -15,8 +15,8 @@ export default class RunRoute extends Route { }, ]; - beforeModel() { - if (this.can.cannot('run job')) { + beforeModel(transition) { + if (this.can.cannot('run job', null, { namespace: transition.to.queryParams.namespace })) { this.transitionTo('jobs'); } } diff --git a/ui/app/templates/components/job-version.hbs b/ui/app/templates/components/job-version.hbs index fc219e964cd..a7076d75f90 100644 --- a/ui/app/templates/components/job-version.hbs +++ b/ui/app/templates/components/job-version.hbs @@ -10,7 +10,7 @@