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

Add new common inventory source fields

Browse Source
This commit is contained in:
Jake McDermott
2020-08-04 16:04:04 -04:00
committed by Ryan Petrello
parent 42e70bc852
commit b253540047
3 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js
View File

@@ -194,6 +194,9 @@ export default ['$state', 'ConfigData', '$scope', 'SourcesFormDefinition', 'Pars
verbosity: $scope.verbosity.value, verbosity: $scope.verbosity.value,
update_cache_timeout: $scope.update_cache_timeout || 0, update_cache_timeout: $scope.update_cache_timeout || 0,
custom_virtualenv: $scope.custom_virtualenv || null, custom_virtualenv: $scope.custom_virtualenv || null,
enabled_var: $scope.enabled_var,
enabled_value: $scope.enabled_value,
host_filter: $scope.host_filter
}; };
if ($scope.source) { if ($scope.source) {

5
awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js
View File

@@ -233,6 +233,8 @@ export default ['$state', '$scope', 'ParseVariableString', 'ParseTypeChange',
$scope.formSave = function() { $scope.formSave = function() {
var params; var params;
console.log($scope);
params = { params = {
id: inventorySourceData.id, id: inventorySourceData.id,
name: $scope.name, name: $scope.name,
@@ -246,6 +248,9 @@ export default ['$state', '$scope', 'ParseVariableString', 'ParseTypeChange',
update_cache_timeout: $scope.update_cache_timeout || 0, update_cache_timeout: $scope.update_cache_timeout || 0,
verbosity: $scope.verbosity.value, verbosity: $scope.verbosity.value,
custom_virtualenv: $scope.custom_virtualenv || null, custom_virtualenv: $scope.custom_virtualenv || null,
enabled_var: $scope.enabled_var,
enabled_value: $scope.enabled_value,
host_filter: $scope.host_filter
}; };
if ($scope.source) { if ($scope.source) {

30
awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js
View File

@@ -300,6 +300,36 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n){
ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)', ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)',
subForm: 'sourceSubForm' subForm: 'sourceSubForm'
}, },
host_filter: {
label: i18n._("Host Filter"),
type: 'text',
dataTitle: i18n._('Host Filter'),
dataPlacement: 'right',
awPopOver: "<p>" + i18n._("Regular expression where only matching hosts will be imported.") + "</p>",
dataContainer: 'body',
ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)',
subForm: 'sourceSubForm'
},
enabled_var: {
label: i18n._("Enabled Variable"),
type: 'text',
dataTitle: i18n._('Enabled Variable'),
dataPlacement: 'right',
awPopOver: "<p>" + i18n._("Retrieve the enabled state from the given dict of host variables. The enabled variable may be specified using dot notation, e.g: 'foo.bar'") + "</p>",
dataContainer: 'body',
ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)',
subForm: 'sourceSubForm'
},
enabled_value: {
label: i18n._("Enabled Value"),
type: 'text',
dataTitle: i18n._('Enabled Value'),
dataPlacement: 'right',
awPopOver: "<p>" + i18n._("If the enabled variable matches this value, the host will be enabled on import.") + "</p>",
dataContainer: 'body',
ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)',
subForm: 'sourceSubForm'
},
checkbox_group: { checkbox_group: {
label: i18n._('Update Options'), label: i18n._('Update Options'),
type: 'checkbox_group', type: 'checkbox_group',