From 7ef79c8a48b25686b2943d45ae5bfd9b7a5f45be Mon Sep 17 00:00:00 2001 From: Floran Brutel Date: Mon, 7 Oct 2019 21:16:08 +0200 Subject: [PATCH] :bug: Fix issue in webui with empty docker stats --- .../js/components/plugin-docker/controller.js | 2 +- glances/outputs/static/package-lock.json | 6 +++--- glances/outputs/static/public/glances.js | Bin 2197500 -> 2197535 bytes glances/outputs/static/public/glances.map.js | Bin 2626406 -> 2626441 bytes 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/glances/outputs/static/js/components/plugin-docker/controller.js b/glances/outputs/static/js/components/plugin-docker/controller.js index 9a6392ae..cf60fb40 100644 --- a/glances/outputs/static/js/components/plugin-docker/controller.js +++ b/glances/outputs/static/js/components/plugin-docker/controller.js @@ -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; } diff --git a/glances/outputs/static/package-lock.json b/glances/outputs/static/package-lock.json index ce8912e3..83f86d17 100644 --- a/glances/outputs/static/package-lock.json +++ b/glances/outputs/static/package-lock.json @@ -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": { diff --git a/glances/outputs/static/public/glances.js b/glances/outputs/static/public/glances.js index f2ea61ca2c43adb86c6a3aaea6f505852e6bb461..8948ea51c1fb0d7fe61aa68e32ee2e82ebd4bdde 100644 GIT binary patch delta 131 zcmey<-^Mt9LK|a43u6mY3v&xg3u_Bo3wsMk3ug;g3wH}o3vUZw3xA71i(rdTi*Sob zi)f2ji+GDfi)4#bi*$=ji)@Qri~JUaehp=Xni_?8z06|Q+=7xyjpCBTlHzFfRA>OjZP+~5RtYj>EKVai^O6mu@QsS#3mLoSb7EN1v)v0 z-vJEY_I2QDG^I^2Zoal9Z-yAm(TqTD^+>C?mJ-VmKoI+CP<4a0Cm_;5qyU zuz1}&-DB>1i@9*6IsV$6yZ&KGh~s$P-dp(O@-VMYUOG}nIYxO#bByL+RM=#Hdyr-V zh#)}$ico?wRGK7|;U~`Y?bYj9?5Cn1Yq0nJudkIonF~ TP9!l3ca|O)A3HHVGrIi&JLqfH -- GitLab