MomoFlora/luci-app-dockerman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-dockerman: fix correct storage unit display to GiB/MiB

Browse Source 
Signed-off-by: sbwml <admin@cooluc.com>
This commit is contained in:
sbwml
2026-02-22 15:45:12 +08:00
parent e37ca2bd46
commit 70c4701456
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/luci-static/resources/view/dockerman/container.js
+4 -4
View File
@@ -749,8 +749,8 @@ return dm2.dv.extend({
memUsage ? createProgressBar( memUsage ? createProgressBar(
_('Memory Usage'), _('Memory Usage'),
memUsage.percentage, memUsage.percentage,
'%1024.2m'.format(memUsage.used), '%1024.2mB'.format(memUsage.used),
'%1024.2m'.format(memUsage.limit) '%1024.2mB'.format(memUsage.limit)
) : E('div', {}, _('Memory usage data unavailable')) ) : E('div', {}, _('Memory usage data unavailable'))
); );
progressBarsSection.appendChild( progressBarsSection.appendChild(
@@ -780,8 +780,8 @@ return dm2.dv.extend({
memUsage ? createProgressBar( memUsage ? createProgressBar(
_('Memory Usage'), _('Memory Usage'),
memUsage.percentage, memUsage.percentage,
'%1024.2m'.format(memUsage.used), '%1024.2mB'.format(memUsage.used),
'%1024.2m'.format(memUsage.limit) '%1024.2mB'.format(memUsage.limit)
) : E('div', {}, _('Memory usage data unavailable')), ) : E('div', {}, _('Memory usage data unavailable')),
cpuUsage ? createProgressBar( cpuUsage ? createProgressBar(
_('CPU Usage') + ` (${cpuUsage.number_cpus} CPUs)`, _('CPU Usage') + ` (${cpuUsage.number_cpus} CPUs)`,
htdocs/luci-static/resources/view/dockerman/overview.js
+2 -2
View File
@@ -163,7 +163,7 @@ return dm2.dv.extend({
this.freespace = isLocal ? mounts.find(m => m.mount === info?.DockerRootDir)?.avail || 0 : 0; this.freespace = isLocal ? mounts.find(m => m.mount === info?.DockerRootDir)?.avail || 0 : 0;
if (isLocal && this.freespace !== 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' }); const mainContainer = E('div', { 'class': 'cbi-map' });
@@ -195,7 +195,7 @@ return dm2.dv.extend({
[_('Docker Version')]: version_response.body.Version, [_('Docker Version')]: version_response.body.Version,
[_('Api Version')]: version_response.body.ApiVersion, [_('Api Version')]: version_response.body.ApiVersion,
[_('CPUs')]: info_response.body.NCPU, [_('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 : '' }`, [_('Docker Root Dir')]: `${info_response.body.DockerRootDir} ${ (isLocal && this.freespace) ? this.freespace : '' }`,
[_('Index Server Address')]: info_response.body.IndexServerAddress, [_('Index Server Address')]: info_response.body.IndexServerAddress,
[_('Registry Mirrors')]: (info_response.body.RegistryConfig?.Mirrors ?? []).join(', ') || '-', [_('Registry Mirrors')]: (info_response.body.RegistryConfig?.Mirrors ?? []).join(', ') || '-',