External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 14:27:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix parseTypeChange params in Projects, Inventory Source, Job Templates extra vars fields, resolves #2866 (#2878)

Browse Source
This commit is contained in:
Leigh Johnson
2016-07-11 09:48:12 -04:00
committed by GitHub
parent 5599b3fd1e
commit 34523d59a2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/scheduler/schedulerAdd.controller.js
View File

@@ -78,11 +78,11 @@ export default ['$compile', '$filter', '$state', '$stateParams', 'AddSchedule',
// extra_data field is not manifested in the UI when scheduling a Management Job // extra_data field is not manifested in the UI when scheduling a Management Job
if ($state.current.name === 'jobTemplateSchedules.add'){ if ($state.current.name === 'jobTemplateSchedules.add'){
$scope.parseType = 'yaml'; $scope.parseType = 'yaml';
// grab any existing extra_vars from parent job_template
var defaultUrl = GetBasePath('job_templates') + $stateParams.id + '/'; var defaultUrl = GetBasePath('job_templates') + $stateParams.id + '/';
Rest.setUrl(defaultUrl); Rest.setUrl(defaultUrl);
Rest.get().then(function(res){ Rest.get().then(function(res){
// sanitize var data = res.data.extra_vars;
var data = JSON.parse(JSON.stringify(res.data.extra_vars));
$scope.extraVars = data === '' ? '---' : data; $scope.extraVars = data === '' ? '---' : data;
ParseTypeChange({ ParseTypeChange({
scope: $scope, scope: $scope,

4
awx/ui/client/src/scheduler/schedulerForm.partial.html
View File

@@ -630,8 +630,8 @@
</a> </a>
<div class="parse-selection"> <div class="parse-selection">
<input type="radio" ng-model="parseType" ng-change="parseTypeChange()" value="yaml"><span class="parse-label">YAML</span> <input type="radio" ng-model="parseType" ng-change="parseTypeChange('parseType', 'extraVars')" value="yaml"><span class="parse-label">YAML</span>
<input type="radio" ng-model="parseType" ng-change="parseTypeChange()" value="json"> <span class="parse-label">JSON</span> <input type="radio" ng-model="parseType" ng-change="parseTypeChange('parseType', 'extraVars')" value="json"> <span class="parse-label">JSON</span>
</div> </div>
</label> </label>