diff --git a/www/data/javascript/admin.js b/www/data/javascript/admin.js index 47c5fdd..1cb4aba 100644 --- a/www/data/javascript/admin.js +++ b/www/data/javascript/admin.js @@ -71,7 +71,7 @@ function startAjaxReplace(target, url) }); } -function refreshConsistencyDisplay(skip) +function refreshConsistencyDisplaySequential(skip) { let i = 0; for (let apibutton of $('.consistence_ajax_handler').toArray()) @@ -113,7 +113,42 @@ function refreshConsistencyDisplay(skip) } } +function refreshConsistencyDisplayParallel(skip) +{ + for (let apibutton of $('.consistence_ajax_handler').toArray()) + { + const filter = $(apibutton).data('filter'); + + $(apibutton).removeClass('consistency_result_intermed'); + $(apibutton).addClass('consistency_result_running'); + + $.ajax('/api/site::selftest?filter=' + filter) + .done((data, status, xhr) => + { + let json = JSON.parse(data); + + if (json.result === 0) $(apibutton).addClass('consistency_result_ok'); + if (json.result === 1) $(apibutton).addClass('consistency_result_warn'); + if (json.result === 2) $(apibutton).addClass('consistency_result_err'); + + $(apibutton).removeClass('consistency_result_running'); + + $(apibutton).text(json.message); + $(apibutton).attr('title', json.long); + }) + .fail((xhr, status, err) => + { + $(apibutton).removeClass('consistency_result_intermed'); + $(apibutton).removeClass('consistency_result_running'); + + $(apibutton).addClass('consistency_result_err'); + $(apibutton).text(err); + }); + } +} + $(function() { - setTimeout(() => refreshConsistencyDisplay(0), 200); + //setTimeout(() => refreshConsistencyDisplaySequential(0), 200); + setTimeout(() => refreshConsistencyDisplayParallel(), 200); }); \ No newline at end of file diff --git a/www/internals/modules/selftest.php b/www/internals/modules/selftest.php index 0bbb0f9..4adff0c 100644 --- a/www/internals/modules/selftest.php +++ b/www/internals/modules/selftest.php @@ -278,7 +278,7 @@ class SelfTest implements IWebsiteModule return [ 'result' => self::STATUS_OK, - 'message' => "$count requests succeeded\n" . $message, + 'message' => "$count requests succeeded\n" . rtrim($message, "\n"), 'long' => null, 'exception' => null, ];