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

add ngToast disable on timeout for log agg notifications, and disable test button until active test completes.

Browse Source
This commit is contained in:
John Mitchell
2020-03-13 15:47:58 -04:00
committed by Christian Adams
parent fb047b1267
commit eb12f45e8e
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -205,18 +205,25 @@ export default [
$scope.$parent.vm.testLogging = function () { $scope.$parent.vm.testLogging = function () {
if (!$scope.$parent.vm.disableTestButton) { if (!$scope.$parent.vm.disableTestButton) {
$scope.$parent.vm.disableTestButton = true;
Rest.setUrl("/api/v2/settings/logging/test/"); Rest.setUrl("/api/v2/settings/logging/test/");
Rest.post({}) Rest.post({})
.then(() => { .then(() => {
$scope.$parent.vm.disableTestButton = false;
ngToast.success({ ngToast.success({
dismissButton: false,
dismissOnTimeout: true,
content: `<i class="fa fa-check-circle content: `<i class="fa fa-check-circle
Toast-successIcon"></i>` + Toast-successIcon"></i>` +
i18n._('Log aggregator test sent successfully.') i18n._('Log aggregator test sent successfully.')
}); });
}) })
.catch(({ data, status }) => { .catch(({ data, status }) => {
$scope.$parent.vm.disableTestButton = false;
if (status === 400 || status == 500) { if (status === 400 || status == 500) {
ngToast.danger({ ngToast.danger({
dismissButton: false,
dismissOnTimeout: true,
content: '<i class="fa fa-exclamation-triangle Toast-successIcon"></i>' + content: '<i class="fa fa-exclamation-triangle Toast-successIcon"></i>' +
i18n._('Log aggregator test failed. <br> Detail: ') + $filter('sanitize')(data.error), i18n._('Log aggregator test failed. <br> Detail: ') + $filter('sanitize')(data.error),
additionalClasses: "LogAggregator-failedNotification" additionalClasses: "LogAggregator-failedNotification"