External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-18 06:47:41 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'extra-vars' into devel

Browse Source
This commit is contained in:
Michael Abashian
2016-03-08 11:03:10 -05:00
parent f2667598f0 976d242075
commit 0a4570ae0a
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html
View File

@@ -49,13 +49,12 @@
</div> </div>
</div> </div>
<!-- TODO: figure out how to show the extra vars on different rows like the mockup --> <div class="StandardOut-detailsRow--extraVars" ng-show="job.extra_vars">
<div class="StandardOut-detailsRow" ng-show="job.extra_vars">
<div class="StandardOut-detailsLabel">EXTRA VARS</div> <div class="StandardOut-detailsLabel">EXTRA VARS</div>
<div class="StandardOut-detailsContent"> </div>
{{ job.extra_vars }}
</div> <div ng-show="job.extra_vars">
<textarea rows="6" ng-model="variables" name="variables" class="StandardOut-extraVars" id="pre-formatted-variables"></textarea>
</div> </div>
</div> </div>

4
awx/ui/client/src/standard-out/standard-out.block.less
View File

@@ -40,6 +40,10 @@
margin-top: 20px; margin-top: 20px;
} }
.StandardOut-detailsRow--extraVars {
margin-bottom: 10px;
}
.StandardOut-detailsLabel { .StandardOut-detailsLabel {
.OnePlusTwo-left--detailsLabel; .OnePlusTwo-left--detailsLabel;
} }

8
awx/ui/client/src/standard-out/standard-out.controller.js
View File

@@ -11,7 +11,7 @@
*/ */
export function JobStdoutController ($rootScope, $scope, $state, $stateParams, ClearScope, GetBasePath, Rest, ProcessErrors, Empty, GetChoices, LookUpName) { export function JobStdoutController ($rootScope, $scope, $state, $stateParams, ClearScope, GetBasePath, Rest, ProcessErrors, Empty, GetChoices, LookUpName, ParseTypeChange, ParseVariableString) {
ClearScope(); ClearScope();
@@ -38,6 +38,10 @@ export function JobStdoutController ($rootScope, $scope, $state, $stateParams, C
} }
}); });
// Set the parse type so that CodeMirror knows how to display extra params YAML/JSON
$scope.parseType = 'yaml';
function getJobDetails() { function getJobDetails() {
// Go out and get the job details based on the job type. jobType gets defined // Go out and get the job details based on the job type. jobType gets defined
@@ -166,4 +170,4 @@ export function JobStdoutController ($rootScope, $scope, $state, $stateParams, C
} }
JobStdoutController.$inject = [ '$rootScope', '$scope', '$state', '$stateParams', 'ClearScope', 'GetBasePath', 'Rest', 'ProcessErrors', 'Empty', 'GetChoices', 'LookUpName']; JobStdoutController.$inject = [ '$rootScope', '$scope', '$state', '$stateParams', 'ClearScope', 'GetBasePath', 'Rest', 'ProcessErrors', 'Empty', 'GetChoices', 'LookUpName', 'ParseTypeChange', 'ParseVariableString'];