From 8aec4ed72e1eb4a5cad97e4bf9ec36caa3a0f486 Mon Sep 17 00:00:00 2001 From: mabashian Date: Thu, 27 Sep 2018 16:30:10 -0400 Subject: [PATCH] Fixes bug where schedule extra vars were not being displayed in the edit form --- .../src/scheduler/schedulerEdit.controller.js | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js index 4aa3044adf..512df41aee 100644 --- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js +++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js @@ -316,13 +316,13 @@ function($filter, $state, $stateParams, Wait, $scope, moment, // the extra vars codemirror is ONLY shown if the // schedule is for a JT and the JT has // ask_variables_on_launch = true. - $scope.extraVars = ParentObject.extra_vars === '' ? '---' : ParentObject.extra_vars; $scope.noVars = false; ParseTypeChange({ scope: $scope, variable: 'extraVars', parse_variable: 'parseType', - field_id: 'SchedulerForm-extraVars' + field_id: 'SchedulerForm-extraVars', + readOnly: !$scope.schedule_obj.summary_fields.user_capabilities.edit }); } else { $scope.noVars = true; @@ -366,16 +366,6 @@ function($filter, $state, $stateParams, Wait, $scope, moment, $scope.missingSurveyValue = processed.missingSurveyValue; - $scope.extraVars = (processed.extra_data === '' || _.isEmpty(processed.extra_data)) ? '---' : '---\n' + jsyaml.safeDump(processed.extra_data); - - ParseTypeChange({ - scope: $scope, - variable: 'extraVars', - parse_variable: 'parseType', - field_id: 'SchedulerForm-extraVars', - readOnly: !$scope.schedule_obj.summary_fields.user_capabilities.edit - }); - $scope.promptData = { launchConf: launchConf, launchOptions: launchOptions,