From 92527b0b2d8a76ee8ae368541c60d0a07c889dbc Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 26 Feb 2020 15:19:34 +0100 Subject: [backup/systemstatus] Show up/downloads in backup page Add AJAX API to dozmod module to query the fileserver status of dmsd. --- .../systemstatus/templates/_page.html | 27 ++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to 'modules-available/systemstatus/templates/_page.html') diff --git a/modules-available/systemstatus/templates/_page.html b/modules-available/systemstatus/templates/_page.html index 3d0f9dfb..f879ea7a 100644 --- a/modules-available/systemstatus/templates/_page.html +++ b/modules-available/systemstatus/templates/_page.html @@ -100,7 +100,16 @@ -
+
+ {{lang_runningUploads}}: ??, + {{lang_runningDownloads}}: ?? +
{{lang_dmsdUnreachable}}
+
+
+ {{#packages}} + {{lang_updatedPackages}}: {{packages}} + {{/packages}} +
@@ -123,7 +132,6 @@ $('#addresses').load('?do=SystemStatus&action=AddressList'); $('#systeminfo').load('?do=SystemStatus&action=SystemInfo'); $('#services').load('?do=SystemStatus&action=Services'); - $('#dmsd-users').load('?do=SystemStatus&action=DmsdUsers'); var slxDone = {}; $('.ajax-tab').on('shown.bs.tab', function (e) { var $this = $(this); @@ -134,5 +142,20 @@ $pane.load('?do=SystemStatus&action=' + w.substring(3)); } }); + var $dmsd = $('#dmsd-users'); + $.ajax({ + url: '?do=dozmod§ion=special&action=dmsd-status', + timeout: 3000, + dataType: 'json' + }).done(function (data) { + if (!data || data.error) { + $dmsd.find('.alert').show(); + } else { + if (data.downloads !== null) $dmsd.find('.downloads').text(data.downloads); + if (data.uploads !== null) $dmsd.find('.uploads').text(data.uploads); + } + }).fail(function () { + $dmsd.find('.alert').show(); + }); }, false); //--> -- cgit v1.2.3-55-g7522