From 979f1befb69656277cda83f5f8d2d46af6fa0f45 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Fri, 14 Jul 2017 16:27:45 -0400 Subject: [PATCH] add level and verify toggle to ctit form in ui --- .../system-form/configuration-system.controller.js | 5 +++++ .../system-form/sub-forms/system-logging.form.js | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/awx/ui/client/src/configuration/system-form/configuration-system.controller.js b/awx/ui/client/src/configuration/system-form/configuration-system.controller.js index 51d6f8ebaf..bbee3dba1f 100644 --- a/awx/ui/client/src/configuration/system-form/configuration-system.controller.js +++ b/awx/ui/client/src/configuration/system-form/configuration-system.controller.js @@ -175,6 +175,10 @@ export default [ $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){ 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_PROTOCOL.$setPristine(); + $scope.$parent.configuration_logging_template_form.LOG_AGGREGATOR_LEVEL.$setPristine(); } } diff --git a/awx/ui/client/src/configuration/system-form/sub-forms/system-logging.form.js b/awx/ui/client/src/configuration/system-form/sub-forms/system-logging.form.js index 98cfe247b8..45a40499d5 100644 --- a/awx/ui/client/src/configuration/system-form/sub-forms/system-logging.form.js +++ b/awx/ui/client/src/configuration/system-form/sub-forms/system-logging.form.js @@ -53,6 +53,14 @@ reqExpression: "LOG_AGGREGATOR_PROTOCOL.value === 'tcp' || LOG_AGGREGATOR_PROTOCOL.value === 'https'", 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' + }, + LOG_AGGREGATOR_VERIFY_CERT: { + type: 'toggleSwitch' } },