From 70c4701456731c8c37ff0bab700b4b4c3261f944 Mon Sep 17 00:00:00 2001 From: sbwml Date: Sun, 22 Feb 2026 15:45:12 +0800 Subject: [PATCH] luci-app-dockerman: fix correct storage unit display to GiB/MiB Signed-off-by: sbwml --- htdocs/luci-static/resources/view/dockerman/container.js | 8 ++++---- htdocs/luci-static/resources/view/dockerman/overview.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/luci-static/resources/view/dockerman/container.js b/htdocs/luci-static/resources/view/dockerman/container.js index f449004..7ea0ffb 100644 --- a/htdocs/luci-static/resources/view/dockerman/container.js +++ b/htdocs/luci-static/resources/view/dockerman/container.js @@ -749,8 +749,8 @@ return dm2.dv.extend({ memUsage ? createProgressBar( _('Memory Usage'), memUsage.percentage, - '%1024.2m'.format(memUsage.used), - '%1024.2m'.format(memUsage.limit) + '%1024.2mB'.format(memUsage.used), + '%1024.2mB'.format(memUsage.limit) ) : E('div', {}, _('Memory usage data unavailable')) ); progressBarsSection.appendChild( @@ -780,8 +780,8 @@ return dm2.dv.extend({ memUsage ? createProgressBar( _('Memory Usage'), memUsage.percentage, - '%1024.2m'.format(memUsage.used), - '%1024.2m'.format(memUsage.limit) + '%1024.2mB'.format(memUsage.used), + '%1024.2mB'.format(memUsage.limit) ) : E('div', {}, _('Memory usage data unavailable')), cpuUsage ? createProgressBar( _('CPU Usage') + ` (${cpuUsage.number_cpus} CPUs)`, diff --git a/htdocs/luci-static/resources/view/dockerman/overview.js b/htdocs/luci-static/resources/view/dockerman/overview.js index e6d56a8..dd0ce9d 100644 --- a/htdocs/luci-static/resources/view/dockerman/overview.js +++ b/htdocs/luci-static/resources/view/dockerman/overview.js @@ -163,7 +163,7 @@ return dm2.dv.extend({ this.freespace = isLocal ? mounts.find(m => m.mount === info?.DockerRootDir)?.avail || 0 : 0; if (isLocal && this.freespace !== 0) - this.freespace = '(' + '%1024.2m'.format(this.freespace) + ' ' + _('Available') + ')'; + this.freespace = '(' + '%1024.2mB'.format(this.freespace) + ' ' + _('Available') + ')'; const mainContainer = E('div', { 'class': 'cbi-map' }); @@ -195,7 +195,7 @@ return dm2.dv.extend({ [_('Docker Version')]: version_response.body.Version, [_('Api Version')]: version_response.body.ApiVersion, [_('CPUs')]: info_response.body.NCPU, - [_('Total Memory')]: '%1024.2m'.format(info_response.body.MemTotal), + [_('Total Memory')]: '%1024.2mB'.format(info_response.body.MemTotal), [_('Docker Root Dir')]: `${info_response.body.DockerRootDir} ${ (isLocal && this.freespace) ? this.freespace : '' }`, [_('Index Server Address')]: info_response.body.IndexServerAddress, [_('Registry Mirrors')]: (info_response.body.RegistryConfig?.Mirrors ?? []).join(', ') || '-',