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

Uses atCodeMirror directive for extra vars widget on workflow results page

Browse Source
This commit is contained in:
Jared Tabor
2018-05-15 18:09:07 -07:00
parent 29927433cb
commit 3658ce1a93
4 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/features/output/details.partial.html
View File

@@ -288,7 +288,6 @@
variables="{{ vm.extraVars.value }}" variables="{{ vm.extraVars.value }}"
tooltip="{{ vm.extraVars.tooltip }}" tooltip="{{ vm.extraVars.tooltip }}"
label="{{ vm.extraVars.label}}" label="{{ vm.extraVars.label}}"
label-class="JobResults-resultRowLabel"
disabled="{{ vm.extraVars.disabled }}"> disabled="{{ vm.extraVars.disabled }}">
</at-code-mirror> </at-code-mirror>

5
awx/ui/client/src/workflow-results/workflow-results.block.less
View File

@@ -137,7 +137,6 @@
margin-left: 20px; margin-left: 20px;
} }
.WorkflowResults-extraVarsHelp { .WorkflowResults-extraVarsLabel {
margin-left: 10px; font-size:14px!important;
color: @default-icon;
} }

6
awx/ui/client/src/workflow-results/workflow-results.controller.js
View File

@@ -84,9 +84,9 @@ export default ['workflowData', 'workflowResultsService', 'workflowDataOptions',
// set up a read only code mirror for extra vars // set up a read only code mirror for extra vars
$scope.variables = ParseVariableString($scope.workflow.extra_vars); $scope.variables = ParseVariableString($scope.workflow.extra_vars);
$scope.parseType = 'yaml'; $scope.parseType = 'yaml';
ParseTypeChange({ scope: $scope, $scope.varsTooltip= i18n._('Read only view of extra variables added to the workflow.');
field_id: 'pre-formatted-variables', $scope.varsLabel = i18n._('Extra Variables');
readOnly: true });
// Click binding for the expand/collapse button on the standard out log // Click binding for the expand/collapse button on the standard out log
$scope.stdoutFullScreen = false; $scope.stdoutFullScreen = false;

28
awx/ui/client/src/workflow-results/workflow-results.partial.html
View File

@@ -145,26 +145,14 @@
</div> </div>
<!-- EXTRA VARIABLES DETAIL --> <!-- EXTRA VARIABLES DETAIL -->
<div class="WorkflowResults-resultRow <at-code-mirror
WorkflowResults-resultRow--variables" ng-if="variables"
ng-show="variables"> variables="{{ variables }}"
<label class="WorkflowResults-resultRowLabel tooltip="{{ varsTooltip }}"
WorkflowResults-resultRowLabel--fullWidth"> label="{{ varsLabel }}"
Extra Variables label-class="WorkflowResults-extraVarsLabel"
<i class="WorkflowResults-extraVarsHelp fa fa-question-circle" disabled="disabled">
aw-tool-tip="{{'Read only view of extra variables added to the workflow.'|translate}}" </at-code-mirror>
data-placement="top">
</i>
</label>
<textarea
rows="6"
ng-model="variables"
name="variables"
class="form-control Form-textArea Form-textAreaLabel Form-formGroup--fullWidth"
id="pre-formatted-variables"
disabled="disabled">
</textarea>
</div>
<!-- LABELS DETAIL --> <!-- LABELS DETAIL -->
<div class="WorkflowResults-resultRow" <div class="WorkflowResults-resultRow"