zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-25 17:31:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add Artifacts CodeMirror field to job details.

Browse Source
This commit is contained in:
kialam
2019-02-06 10:17:27 -07:00
parent 902fb83493
commit 07aae8cefc
8 changed files with 67 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
awx/ui/client/lib/components/code-mirror/code-mirror.directive.js
View File

@@ -1,9 +1,7 @@
const templateUrl = require('~components/code-mirror/code-mirror.partial.html');
const CodeMirrorID = 'codemirror-extra-vars';
const CodeMirrorModalID = '#CodeMirror-modal';
const ParseVariable = 'parseType';
const CodeMirrorVar = 'variables';
const ParseType = 'yaml';
function atCodeMirrorController (
@@ -13,19 +11,20 @@ function atCodeMirrorController (
ParseVariableString
) {
const vm = this;
function init (vars) {
const variables = `${$scope.name}_variables`;
function init (vars, name) {
if ($scope.disabled === 'true') {
$scope.disabled = true;
} else if ($scope.disabled === 'false') {
$scope.disabled = false;
}
$scope.variables = ParseVariableString(_.cloneDeep(vars));
$scope[variables] = ParseVariableString(_.cloneDeep(vars));
$scope.parseType = ParseType;
const options = {
scope: $scope,
variable: CodeMirrorVar,
variable: variables,
parse_variable: ParseVariable,
field_id: CodeMirrorID,
field_id: name,
readOnly: $scope.disabled
};
ParseTypeChange(options);
@@ -42,6 +41,9 @@ function atCodeMirrorController (
vm.expanded = false;
}
vm.variables = variables;
vm.name = $scope.name;
vm.modalName = `${vm.name}_modal`;
vm.strings = strings;
vm.expanded = false;
vm.close = close;
@@ -49,7 +51,9 @@ function atCodeMirrorController (
if ($scope.init) {
$scope.init = init;
}
init($scope.variables);
angular.element(document).ready(() => {
init($scope.variables, $scope.name);
});
}
atCodeMirrorController.$inject = [
@@ -74,6 +78,7 @@ function atCodeMirrorTextarea () {
tooltip: '@',
tooltipPlacement: '@',
variables: '@',
name: '@',
init: '='
}
};

7
awx/ui/client/lib/components/code-mirror/code-mirror.partial.html
View File

@@ -23,7 +23,7 @@
type="radio"
value="yaml"
ng-model="parseType"
ng-change="parseTypeChange('parseType', 'variables')"
ng-change="parseTypeChange('parseType', vm.variables)"
class="ng-pristine ng-untouched ng-valid ng-not-empty">
{{ vm.strings.get('label.YAML')}}
</label>
@@ -32,7 +32,7 @@
type="radio"
value="json"
ng-model="parseType"
ng-change="parseTypeChange('parseType', 'variables')"
ng-change="parseTypeChange('parseType', vm.variables)"
class="ng-pristine ng-untouched ng-valid ng-not-empty">
{{ vm.strings.get('label.JSON')}}
</label>
@@ -47,9 +47,10 @@
ng-model="variables"
name="variables"
class="form-control Form-textArea"
id="codemirror-extra-vars">
id="{{ vm.name }}">
</textarea>
<at-code-mirror-modal
name="{{ vm.modalName }}"
ng-if="vm.expanded"
variables="{{ variables }}"
tooltip="{{ tooltip || vm.strings.get('code_mirror.tooltip.TOOLTIP') }}"

23
awx/ui/client/lib/components/code-mirror/modal/code-mirror-modal.directive.js
View File

@@ -1,9 +1,7 @@
const templateUrl = require('~components/code-mirror/modal/code-mirror-modal.partial.html');
const CodeMirrorModalID = '#CodeMirror-modal';
const CodeMirrorID = 'codemirror-extra-vars-modal';
const ParseVariable = 'parseType';
const CodeMirrorVar = 'extra_variables';
const ParseType = 'yaml';
const ModalHeight = '#CodeMirror-modal .modal-dialog';
const ModalHeader = '.atCodeMirror-label';
@@ -16,6 +14,7 @@ function atCodeMirrorModalController (
ParseVariableString
) {
const vm = this;
const variables = `${$scope.name}_variables`;
function resize () {
if ($scope.disabled === 'true') {
$scope.disabled = true;
@@ -29,24 +28,24 @@ function atCodeMirrorModalController (
}
function toggle () {
$scope.parseTypeChange('parseType', 'extra_variables');
$scope.parseTypeChange('parseType', variables);
setTimeout(resize, 0);
}
function init () {
function init (vars, name) {
if ($scope.disabled === 'true') {
$scope.disabled = true;
} else if ($scope.disabled === 'false') {
$scope.disabled = false;
}
$(CodeMirrorModalID).modal('show');
$scope.extra_variables = ParseVariableString(_.cloneDeep($scope.variables));
$scope[variables] = ParseVariableString(_.cloneDeep(vars));
$scope.parseType = ParseType;
const options = {
scope: $scope,
variable: CodeMirrorVar,
variable: variables,
parse_variable: ParseVariable,
field_id: CodeMirrorID,
field_id: name,
readOnly: $scope.disabled
};
ParseTypeChange(options);
@@ -59,9 +58,16 @@ function atCodeMirrorModalController (
$(`${CodeMirrorModalID} .modal-dialog`).on('resize', resize);
}
vm.variables = variables;
vm.name = $scope.name;
vm.strings = strings;
vm.toggle = toggle;
init();
if ($scope.init) {
$scope.init = init;
}
angular.element(document).ready(() => {
init($scope.variables, $scope.name);
});
}
atCodeMirrorModalController.$inject = [
@@ -85,6 +91,7 @@ function atCodeMirrorModal () {
labelClass: '@',
tooltip: '@',
variables: '@',
name: '@',
closeFn: '&'
}
};

2
awx/ui/client/lib/components/code-mirror/modal/code-mirror-modal.partial.html
View File

@@ -58,7 +58,7 @@
ng-model="extra_variables"
name="extra_variables"
class="form-control Form-textArea"
id="codemirror-extra-vars-modal">
id="{{ vm.name }}">
</textarea>
</div>
<div class="modal-footer">