View Your License
diff --git a/awx/ui/client/src/shared/Utilities.js b/awx/ui/client/src/shared/Utilities.js
index 0b7a86970f..5a49d1e8ff 100644
--- a/awx/ui/client/src/shared/Utilities.js
+++ b/awx/ui/client/src/shared/Utilities.js
@@ -720,7 +720,8 @@ angular.module('Utilities', ['RestServices', 'Utilities'])
field = params.field,
variable = params.variable,
callback = params.callback,
- choice_name = params.choice_name;
+ choice_name = params.choice_name,
+ options = params.options;
if (scope[variable]) {
scope[variable].length = 0;
@@ -728,42 +729,50 @@ angular.module('Utilities', ['RestServices', 'Utilities'])
scope[variable] = [];
}
- Rest.setUrl(url);
- Rest.options()
- .success(function(data) {
- var choices, defaultChoice;
- choices = (choice_name) ? data.actions.GET[field][choice_name] : data.actions.GET[field].choices;
- if (data && data.actions && data.actions.POST && data.actions.POST[field]) {
- defaultChoice = data.actions.POST[field].default;
- }
- if (choices) {
- // including 'name' property so list can be used by search
- choices.forEach(function(choice) {
- scope[variable].push({
- label: choice[1],
- value: choice[0],
- name: choice[1]
- });
+ var withOptions = function(options) {
+ var choices, defaultChoice;
+ choices = (choice_name) ? options.actions.GET[field][choice_name] : options.actions.GET[field].choices;
+ if (options && options.actions && options.actions.POST && options.actions.POST[field]) {
+ defaultChoice = options.actions.POST[field].default;
+ }
+ if (choices) {
+ // including 'name' property so list can be used by search
+ choices.forEach(function(choice) {
+ scope[variable].push({
+ label: choice[1],
+ value: choice[0],
+ name: choice[1]
});
- }
- if (defaultChoice !== undefined) {
- var val;
- for (val in scope[variable]) {
- if (scope[variable][val].value === defaultChoice) {
- scope[variable][val].isDefault = true;
- }
+ });
+ }
+ if (defaultChoice !== undefined) {
+ var val;
+ for (val in scope[variable]) {
+ if (scope[variable][val].value === defaultChoice) {
+ scope[variable][val].isDefault = true;
}
}
- if (callback) {
- scope.$emit(callback);
- }
- })
- .error(function(data, status) {
- ProcessErrors(scope, data, status, null, {
- hdr: 'Error!',
- msg: 'Failed to get ' + url + '. GET status: ' + status
- });
- });
+ }
+ if (callback) {
+ scope.$emit(callback);
+ }
+ };
+
+ if (!options) {
+ Rest.setUrl(url);
+ Rest.options()
+ .success(function(data) {
+ withOptions(data);
+ })
+ .error(function(data, status) {
+ ProcessErrors(scope, data, status, null, {
+ hdr: 'Error!',
+ msg: 'Failed to get ' + url + '. GET status: ' + status
+ });
+ });
+ } else {
+ withOptions(options);
+ }
};
}
])
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 6e6118c7f0..63d813ff12 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -646,6 +646,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += (field.labelClass) ? field.labelClass : "";
html += `${field.required ? ' prepend-asterisk ' : ''}`;
html += (horizontal) ? " " + getLabelWidth() : "Form-inputLabelContainer ";
+ html += (field.showParseTypeToggle) ? "Form-inputLabelContainer--codeMirror " : "";
html += "\" ";
html += (field.labelNGClass) ? "ng-class=\"" + field.labelNGClass + "\" " : "";
html += "for=\"" + fld + '">\n';
@@ -658,7 +659,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += (field.awPopOver && !field.awPopOverRight) ? Attr(field, 'awPopOver', fld) : "";
html += (field.hintText) ? "\n\t\t\n\t\t\t\n\t\t\t\n\t\t\tHint: " + field.hintText + "\n\t\t" : "";
// Variable editing
- if (fld === "variables" || fld === "extra_vars" || _.last(fld.split('_')) === 'variables' || fld === 'source_vars') {
+ if (fld === "variables" || fld === "extra_vars" || _.last(fld.split('_')) === 'variables' || fld === 'source_vars' || field.showParseTypeToggle === true) {
let parseTypeId = `${form.name}_${fld}_parse_type`;
let parseTypeName = field.parseTypeName || 'parseType';
let getToggleClass = (primary, secondary) => `{
diff --git a/awx/ui/client/src/shared/rbacUiControl.js b/awx/ui/client/src/shared/rbacUiControl.js
index 867fc4a6cb..ee74951d43 100644
--- a/awx/ui/client/src/shared/rbacUiControl.js
+++ b/awx/ui/client/src/shared/rbacUiControl.js
@@ -20,7 +20,7 @@ export default
Rest.options()
.success(function(data) {
if (data.actions.POST) {
- canAddVal.resolve(true);
+ canAddVal.resolve({canAdd: true, options: data});
} else {
canAddVal.reject(false);
}
diff --git a/awx/ui/client/src/teams/list/teams-list.controller.js b/awx/ui/client/src/teams/list/teams-list.controller.js
index 1477452358..2e59cf0b42 100644
--- a/awx/ui/client/src/teams/list/teams-list.controller.js
+++ b/awx/ui/client/src/teams/list/teams-list.controller.js
@@ -21,8 +21,8 @@ export default ['$scope', 'Rest', 'TeamList', 'Prompt', 'ClearScope',
$scope.canAdd = false;
rbacUiControlService.canAdd('teams')
- .then(function(canAdd) {
- $scope.canAdd = canAdd;
+ .then(function(params) {
+ $scope.canAdd = params.canAdd;
});
// search init
$scope.list = list;
diff --git a/awx/ui/client/src/templates/list/templates-list.controller.js b/awx/ui/client/src/templates/list/templates-list.controller.js
index 397351ec6f..5cd54f1347 100644
--- a/awx/ui/client/src/templates/list/templates-list.controller.js
+++ b/awx/ui/client/src/templates/list/templates-list.controller.js
@@ -25,13 +25,13 @@ export default ['$scope', '$rootScope',
$scope.canAdd = false;
rbacUiControlService.canAdd("job_templates")
- .then(function(canAddJobTemplate) {
- $scope.canAddJobTemplate = canAddJobTemplate;
+ .then(function(params) {
+ $scope.canAddJobTemplate = params.canAdd;
});
rbacUiControlService.canAdd("workflow_job_templates")
- .then(function(canAddWorkflowJobTemplate) {
- $scope.canAddWorkflowJobTemplate = canAddWorkflowJobTemplate;
+ .then(function(params) {
+ $scope.canAddWorkflowJobTemplate = params.canAdd;
});
// search init
$scope.list = list;
diff --git a/awx/ui/client/src/users/list/users-list.controller.js b/awx/ui/client/src/users/list/users-list.controller.js
index 3eb05edb83..c443c634b2 100644
--- a/awx/ui/client/src/users/list/users-list.controller.js
+++ b/awx/ui/client/src/users/list/users-list.controller.js
@@ -34,8 +34,8 @@ export default ['$scope', '$rootScope', 'Rest', 'UserList', 'Prompt',
$scope.canAdd = false;
rbacUiControlService.canAdd('users')
- .then(function(canAdd) {
- $scope.canAdd = canAdd;
+ .then(function(params) {
+ $scope.canAdd = params.canAdd;
});
// search init