From 4b2daba3f73d477645d8accfb8b54a3221abf3c1 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Mon, 30 Jan 2017 13:29:21 -0500 Subject: [PATCH 1/5] make jobs schedules disabled if the user doesn't have permission to edit --- awx/ui/client/src/lists/ScheduledJobs.js | 1 + .../client/src/scheduler/scheduleToggle.block.less | 8 +++++++- awx/ui/client/src/shared/form-generator.js | 2 +- awx/ui/client/src/shared/generator-helpers.js | 12 ++++++++---- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/awx/ui/client/src/lists/ScheduledJobs.js b/awx/ui/client/src/lists/ScheduledJobs.js index 8afde66081..736ad61e4e 100644 --- a/awx/ui/client/src/lists/ScheduledJobs.js +++ b/awx/ui/client/src/lists/ScheduledJobs.js @@ -25,6 +25,7 @@ export default ngClick: "toggleSchedule($event, schedule.id)", nosort: true, awToolTip: "{{ schedule.play_tip }}", + ngDisabled: "!schedule.summary_fields.user_capabilities.edit", dataTipWatch: "schedule.play_tip", dataPlacement: 'top' }, diff --git a/awx/ui/client/src/scheduler/scheduleToggle.block.less b/awx/ui/client/src/scheduler/scheduleToggle.block.less index c553201ade..9733274bfe 100644 --- a/awx/ui/client/src/scheduler/scheduleToggle.block.less +++ b/awx/ui/client/src/scheduler/scheduleToggle.block.less @@ -6,9 +6,11 @@ border-radius: 5px; border: 1px solid @default-icon; background-color: @default-icon; - width: 40px; + width: 42px; margin-top: 2px; cursor: pointer; + display: flex; + height: 18px; } .ScheduleToggle-switch { @@ -22,6 +24,10 @@ font-size: 11px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; + padding-top: 0px; + margin-top: 0px; + border-top: 0px; + border-bottom: 0px; } .ScheduleToggle.is-on { diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js index 070b637067..4c07eefecb 100644 --- a/awx/ui/client/src/shared/form-generator.js +++ b/awx/ui/client/src/shared/form-generator.js @@ -1271,7 +1271,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat for (i = 0; i < field.options.length; i++) { html += "
- +
+
A value is required.
This is not a valid number.
@@ -175,6 +183,7 @@ Every *
@@ -270,6 +281,7 @@ *
+ disabled="!(schedule_obj.summary_fields.user_capabilities.edit || canAdd)">