External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-03 01:38:50 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7089 from jlmitch5/newLoggingCtitFields

Browse Source 
add level and verify toggle to ctit form in ui
This commit is contained in:
jlmitch5
2017-07-17 16:49:06 -04:00
committed by GitHub
parent 94813c8049 a5ca36be50
commit 426ec28b19
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/src/configuration/system-form/configuration-system.controller.js
View File

@@ -175,6 +175,10 @@ export default [
$scope.$parent.LOG_AGGREGATOR_PROTOCOL = _.find($scope.$parent.LOG_AGGREGATOR_PROTOCOL_options, { value: $scope.$parent.LOG_AGGREGATOR_PROTOCOL }); $scope.$parent.LOG_AGGREGATOR_PROTOCOL = _.find($scope.$parent.LOG_AGGREGATOR_PROTOCOL_options, { value: $scope.$parent.LOG_AGGREGATOR_PROTOCOL });
} }
if($scope.$parent.LOG_AGGREGATOR_LEVEL !== null) {
$scope.$parent.LOG_AGGREGATOR_LEVEL = _.find($scope.$parent.LOG_AGGREGATOR_LEVEL_options, { value: $scope.$parent.LOG_AGGREGATOR_LEVEL });
}
if(flag !== undefined){ if(flag !== undefined){
dropdownRendered = flag; dropdownRendered = flag;
} }
@@ -188,6 +192,7 @@ export default [
}); });
$scope.$parent.configuration_logging_template_form.LOG_AGGREGATOR_TYPE.$setPristine(); $scope.$parent.configuration_logging_template_form.LOG_AGGREGATOR_TYPE.$setPristine();
$scope.$parent.configuration_logging_template_form.LOG_AGGREGATOR_PROTOCOL.$setPristine(); $scope.$parent.configuration_logging_template_form.LOG_AGGREGATOR_PROTOCOL.$setPristine();
$scope.$parent.configuration_logging_template_form.LOG_AGGREGATOR_LEVEL.$setPristine();
} }
} }

12
awx/ui/client/src/configuration/system-form/sub-forms/system-logging.form.js
View File

@@ -43,7 +43,8 @@
LOG_AGGREGATOR_PROTOCOL: { LOG_AGGREGATOR_PROTOCOL: {
type: 'select', type: 'select',
reset: 'LOG_AGGREGATOR_PROTOCOL', reset: 'LOG_AGGREGATOR_PROTOCOL',
ngOptions: 'type.label for type in LOG_AGGREGATOR_PROTOCOL_options track by type.value' ngOptions: 'type.label for type in LOG_AGGREGATOR_PROTOCOL_options track by type.value',
disableChooseOption: true
}, },
LOG_AGGREGATOR_TCP_TIMEOUT: { LOG_AGGREGATOR_TCP_TIMEOUT: {
type: 'text', type: 'text',
@@ -53,6 +54,15 @@
reqExpression: "LOG_AGGREGATOR_PROTOCOL.value === 'tcp' || LOG_AGGREGATOR_PROTOCOL.value === 'https'", reqExpression: "LOG_AGGREGATOR_PROTOCOL.value === 'tcp' || LOG_AGGREGATOR_PROTOCOL.value === 'https'",
init: "false" init: "false"
}, },
},
LOG_AGGREGATOR_LEVEL: {
type: 'select',
reset: 'LOG_AGGREGATOR_LEVEL',
ngOptions: 'type.label for type in LOG_AGGREGATOR_LEVEL_options track by type.value',
disableChooseOption: true
},
LOG_AGGREGATOR_VERIFY_CERT: {
type: 'toggleSwitch'
} }
}, },