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

fixing ngToast.danger message for failed test aggregation

Browse Source
This commit is contained in:
Jared Tabor
2017-08-22 15:02:17 -04:00
parent 022de2aa3e
commit d3826c5c50
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/src/configuration/configuration.block.less
View File

@@ -161,5 +161,8 @@ input#filePickerText {
border-style: solid; border-style: solid;
border-color: @default-interface-txt transparent transparent transparent; border-color: @default-interface-txt transparent transparent transparent;
} }
}
.LogAggregator-failedNotification{
max-width: 300px;
} }

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

@@ -18,6 +18,7 @@ export default [
'Rest', 'Rest',
'ProcessErrors', 'ProcessErrors',
'ngToast', 'ngToast',
'$filter',
function( function(
$rootScope, $scope, $state, $stateParams, $timeout, $rootScope, $scope, $state, $stateParams, $timeout,
AngularCodeMirror, AngularCodeMirror,
@@ -31,7 +32,8 @@ export default [
i18n, i18n,
Rest, Rest,
ProcessErrors, ProcessErrors,
ngToast ngToast,
$filter
) { ) {
var systemVm = this; var systemVm = this;
@@ -215,10 +217,9 @@ export default [
.catch(({data, status}) => { .catch(({data, status}) => {
if (status === 500) { if (status === 500) {
ngToast.danger({ ngToast.danger({
content: `<i class="fa fa-exclamation-triangle content: '<i class="fa fa-exclamation-triangle Toast-successIcon"></i>' +
Toast-successIcon"></i>` + i18n._('Log aggregator test failed. <br> Detail: ') + $filter('sanitize')(data.error),
i18n._('Log aggregator test failed.<br />Detail: ') + additionalClasses: "LogAggregator-failedNotification"
data.error
}); });
} else { } else {
ProcessErrors($scope, data, status, null, ProcessErrors($scope, data, status, null,