From 10519317f4a9b6b6befc296d1494eae180aebb2c Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Mon, 14 Aug 2017 19:30:42 -0700 Subject: [PATCH] removing vars from schedules for project syncs and inv syncs --- .../src/scheduler/schedulerAdd.controller.js | 20 +++----------- .../src/scheduler/schedulerEdit.controller.js | 27 ++++++++++++------- .../src/scheduler/schedulerForm.partial.html | 2 +- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/awx/ui/client/src/scheduler/schedulerAdd.controller.js b/awx/ui/client/src/scheduler/schedulerAdd.controller.js index c8e21388a7..91dde4352a 100644 --- a/awx/ui/client/src/scheduler/schedulerAdd.controller.js +++ b/awx/ui/client/src/scheduler/schedulerAdd.controller.js @@ -134,24 +134,10 @@ export default ['$filter', '$state', '$stateParams', 'AddSchedule', 'Wait', }); } else if ($state.current.name === 'projectSchedules.add'){ - $scope.extraVars = '---'; - $scope.parseType = 'yaml'; - ParseTypeChange({ - scope: $scope, - variable: 'extraVars', - parse_variable: 'parseType', - field_id: 'SchedulerForm-extraVars' - }); + $scope.noVars = true; } - else if ($state.current.name === 'inventoryManage.editGroup.schedules.add'){ - $scope.extraVars = '---'; - $scope.parseType = 'yaml'; - ParseTypeChange({ - scope: $scope, - variable: 'extraVars', - parse_variable: 'parseType', - field_id: 'SchedulerForm-extraVars' - }); + else if ($state.current.name === 'inventories.edit.inventory_sources.edit.schedules.add'){ + $scope.noVars = true; } AddSchedule({ scope: $scope, diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js index c8e7dab9ca..c6030fdd94 100644 --- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js +++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js @@ -93,15 +93,24 @@ function($filter, $state, $stateParams, EditSchedule, Wait, $scope, $rootScope, // extra_data field is not manifested in the UI when scheduling a Management Job if ($state.current.name !== 'managementJobsList.schedule.add' && $state.current.name !== 'managementJobsList.schedule.edit'){ $scope.$on('ScheduleFound', function(){ - let readOnly = !$scope.schedule_obj.summary_fields.user_capabilities - .edit; - ParseTypeChange({ - scope: $scope, - variable: 'extraVars', - parse_variable: 'parseType', - field_id: 'SchedulerForm-extraVars', - readOnly: readOnly - }); + if ($state.current.name === 'projectSchedules.edit'){ + $scope.noVars = true; + } + else if ($state.current.name === 'inventories.edit.inventory_sources.edit.schedules.edit'){ + $scope.noVars = true; + } + else { + let readOnly = !$scope.schedule_obj.summary_fields.user_capabilities + .edit; + ParseTypeChange({ + scope: $scope, + variable: 'extraVars', + parse_variable: 'parseType', + field_id: 'SchedulerForm-extraVars', + readOnly: readOnly + }); + } + }); } diff --git a/awx/ui/client/src/scheduler/schedulerForm.partial.html b/awx/ui/client/src/scheduler/schedulerForm.partial.html index d9b7d1889f..ca6d0558fc 100644 --- a/awx/ui/client/src/scheduler/schedulerForm.partial.html +++ b/awx/ui/client/src/scheduler/schedulerForm.partial.html @@ -636,7 +636,7 @@ -
+