From d3826c5c508ab37d09d49afe5d1b6b721d9e4b7e Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Tue, 22 Aug 2017 15:02:17 -0400 Subject: [PATCH] fixing ngToast.danger message for failed test aggregation --- .../client/src/configuration/configuration.block.less | 5 ++++- .../system-form/configuration-system.controller.js | 11 ++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/awx/ui/client/src/configuration/configuration.block.less b/awx/ui/client/src/configuration/configuration.block.less index 2f32e9ed56..bc6f4faa38 100644 --- a/awx/ui/client/src/configuration/configuration.block.less +++ b/awx/ui/client/src/configuration/configuration.block.less @@ -161,5 +161,8 @@ input#filePickerText { border-style: solid; border-color: @default-interface-txt transparent transparent transparent; } - +} + +.LogAggregator-failedNotification{ + max-width: 300px; } 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 cd6640f6b7..7f1a11d2cd 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 @@ -18,6 +18,7 @@ export default [ 'Rest', 'ProcessErrors', 'ngToast', + '$filter', function( $rootScope, $scope, $state, $stateParams, $timeout, AngularCodeMirror, @@ -31,7 +32,8 @@ export default [ i18n, Rest, ProcessErrors, - ngToast + ngToast, + $filter ) { var systemVm = this; @@ -215,10 +217,9 @@ export default [ .catch(({data, status}) => { if (status === 500) { ngToast.danger({ - content: `` + - i18n._('Log aggregator test failed.
Detail: ') + - data.error + content: '' + + i18n._('Log aggregator test failed.
Detail: ') + $filter('sanitize')(data.error), + additionalClasses: "LogAggregator-failedNotification" }); } else { ProcessErrors($scope, data, status, null,