nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-12-21 00:01:53 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1546 from notFloran/webui-docker

Browse Source 
🐛 Fix issue in WebUI with empty docker stats
This commit is contained in:
Nicolas Hennion 2019-10-08 21:26:24 +02:00 committed by GitHub
commit 3e70800920
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glances/outputs/static/js/components/plugin-docker/controller.js
View File

@ -8,7 +8,7 @@ export default function GlancesPluginDockerController($scope, GlancesStats) {
var stats = data.stats['docker'];
vm.containers = [];
if (_.isEmpty(stats)) {
if (_.isEmpty(stats) || _.isEmpty(stats['containers']) ) {
return;
}

6
glances/outputs/static/package-lock.json generated
View File

@ -3439,7 +3439,7 @@
},
"load-json-file": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
"resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
"dev": true,
"requires": {
@ -3637,7 +3637,7 @@
"dependencies": {
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true
}
@ -4145,7 +4145,7 @@
},
"os-locale": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
"resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
"dev": true,
"requires": {

2
glances/outputs/static/public/glances.js vendored
View File

@ -57973,7 +57973,7 @@ function GlancesPluginDockerController($scope, GlancesStats) {
var stats = data.stats['docker'];
vm.containers = [];
if (_.isEmpty(stats)) {
if (_.isEmpty(stats) || _.isEmpty(stats['containers']) ) {
return;
}

2
glances/outputs/static/public/glances.map.js vendored
View File

File diff suppressed because one or more lines are too long