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

Fixed verbosity select on inventory source form

Browse Source
This commit is contained in:
Michael Abashian
2017-06-09 11:40:58 -04:00
parent ba539c7ff6
commit efe608cf2e
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
awx/ui/client/src/inventories/sources/add/sources-add.controller.js
View File

@@ -171,13 +171,6 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition',
initRegionSelect(); initRegionSelect();
}; };
// region / source options callback // region / source options callback
$scope.$on('choicesReadyGroup', function() {
initRegionSelect();
});
$scope.$on('choicesReadyVerbosity', function() {
initVerbositySelect();
});
$scope.$on('sourceTypeOptionsReady', function() { $scope.$on('sourceTypeOptionsReady', function() {
initSourceSelect(); initSourceSelect();
@@ -216,7 +209,6 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition',
field: 'source_regions', field: 'source_regions',
variable: 'rax_regions', variable: 'rax_regions',
choice_name: 'rax_region_choices', choice_name: 'rax_region_choices',
callback: 'choicesReadyGroup',
options: inventorySourcesOptions options: inventorySourcesOptions
}); });
@@ -225,7 +217,6 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition',
field: 'source_regions', field: 'source_regions',
variable: 'ec2_regions', variable: 'ec2_regions',
choice_name: 'ec2_region_choices', choice_name: 'ec2_region_choices',
callback: 'choicesReadyGroup',
options: inventorySourcesOptions options: inventorySourcesOptions
}); });
@@ -234,7 +225,6 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition',
field: 'source_regions', field: 'source_regions',
variable: 'gce_regions', variable: 'gce_regions',
choice_name: 'gce_region_choices', choice_name: 'gce_region_choices',
callback: 'choicesReadyGroup',
options: inventorySourcesOptions options: inventorySourcesOptions
}); });
@@ -243,7 +233,6 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition',
field: 'source_regions', field: 'source_regions',
variable: 'azure_regions', variable: 'azure_regions',
choice_name: 'azure_region_choices', choice_name: 'azure_region_choices',
callback: 'choicesReadyGroup',
options: inventorySourcesOptions options: inventorySourcesOptions
}); });
@@ -253,22 +242,23 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition',
field: 'group_by', field: 'group_by',
variable: 'ec2_group_by', variable: 'ec2_group_by',
choice_name: 'ec2_group_by_choices', choice_name: 'ec2_group_by_choices',
callback: 'choicesReadyGroup',
options: inventorySourcesOptions options: inventorySourcesOptions
}); });
initRegionSelect();
GetChoices({ GetChoices({
scope: $scope, scope: $scope,
field: 'verbosity', field: 'verbosity',
variable: 'verbosity_options', variable: 'verbosity_options',
callback: 'choicesReadyVerbosity',
options: inventorySourcesOptions options: inventorySourcesOptions
}); });
initVerbositySelect();
GetSourceTypeOptions({ GetSourceTypeOptions({
scope: $scope, scope: $scope,
variable: 'source_type_options' variable: 'source_type_options'
//callback: 'sourceTypeOptionsReady' this callback is hard-coded into GetSourceTypeOptions(), included for ref
}); });
} }

1
awx/ui/client/src/inventories/sources/sources.form.js
View File

@@ -286,7 +286,6 @@ return {
ngOptions: 'v.label for v in verbosity_options track by v.value', ngOptions: 'v.label for v in verbosity_options track by v.value',
ngShow: "source && (source.value !== '' && source.value !== null)", ngShow: "source && (source.value !== '' && source.value !== null)",
"default": 0, "default": 0,
required: true,
column: 1, column: 1,
awPopOver: "<p>" + i18n._("Control the level of output ansible will produce for inventory source update jobs.") + "</p>", awPopOver: "<p>" + i18n._("Control the level of output ansible will produce for inventory source update jobs.") + "</p>",
dataTitle: i18n._('Verbosity'), dataTitle: i18n._('Verbosity'),