From d2595944fc3295bea4e7b2d406bd0899265858a0 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Fri, 18 Aug 2017 14:01:12 -0400 Subject: [PATCH 1/2] make sure all toggles on ctit form are disabled --- awx/ui/client/src/scheduler/scheduleToggle.block.less | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/awx/ui/client/src/scheduler/scheduleToggle.block.less b/awx/ui/client/src/scheduler/scheduleToggle.block.less index bb30e7e60f..3cdb8f8f40 100644 --- a/awx/ui/client/src/scheduler/scheduleToggle.block.less +++ b/awx/ui/client/src/scheduler/scheduleToggle.block.less @@ -1,5 +1,14 @@ /** @define ScheduleToggle */ +.Form-formGroup--disabled .ScheduleToggle { + cursor: not-allowed; + border-color: @default-link !important; + .ScheduleToggle-switch { + background-color: @d7grey !important; + cursor: not-allowed; + } +} + .ScheduleToggle { border-radius: 5px; border: 1px solid @default-link; From 08574428f10d2c680914e63621f730b82004c92f Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Fri, 18 Aug 2017 14:28:25 -0400 Subject: [PATCH 2/2] add disabled toggle to job templte diff mode --- .../client/src/job-submission/job-submission.partial.html | 3 ++- awx/ui/client/src/shared/form-generator.js | 8 +++++--- .../src/templates/job_templates/job-template.form.js | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/src/job-submission/job-submission.partial.html b/awx/ui/client/src/job-submission/job-submission.partial.html index 0452e77e4d..53d043060b 100644 --- a/awx/ui/client/src/job-submission/job-submission.partial.html +++ b/awx/ui/client/src/job-submission/job-submission.partial.html @@ -258,7 +258,8 @@
- +
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js index 10b6ae0a62..3f1cec8af0 100644 --- a/awx/ui/client/src/shared/form-generator.js +++ b/awx/ui/client/src/shared/form-generator.js @@ -758,10 +758,12 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat html += label(labelOptions); - html += `
- - + +
`; } diff --git a/awx/ui/client/src/templates/job_templates/job-template.form.js b/awx/ui/client/src/templates/job_templates/job-template.form.js index a25cfeccd8..e5e0e4c257 100644 --- a/awx/ui/client/src/templates/job_templates/job-template.form.js +++ b/awx/ui/client/src/templates/job_templates/job-template.form.js @@ -272,6 +272,7 @@ function(NotificationsList, CompletedJobsList, i18n) { variable: 'ask_diff_mode_on_launch', text: i18n._('Prompt on launch') }, + ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)' }, checkbox_group: { label: i18n._('Options'),