From 6d9cbe831f1ab7f9cc4d5c62e4f60c6f4c102535 Mon Sep 17 00:00:00 2001 From: Floran Brutel Date: Mon, 22 Apr 2019 12:58:55 +0200 Subject: [PATCH] :bug: Fix username handling when is null --- .../plugin-processlist/controller.js | 4 ++-- glances/outputs/static/public/glances.js | Bin 2188705 -> 2188735 bytes glances/outputs/static/public/glances.map.js | Bin 2616492 -> 2616522 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glances/outputs/static/js/components/plugin-processlist/controller.js b/glances/outputs/static/js/components/plugin-processlist/controller.js index 0b8d2db0..fe42580e 100644 --- a/glances/outputs/static/js/components/plugin-processlist/controller.js +++ b/glances/outputs/static/js/components/plugin-processlist/controller.js @@ -78,10 +78,10 @@ export default function GlancesPluginProcesslistController($scope, GlancesStats, process.cmdline = process.name; } - if (data.isWindows) { + if (data.isWindows && process.username !== null) { process.username = _.last(process.username.split('\\')); } - + vm.processes.push(process); } } diff --git a/glances/outputs/static/public/glances.js b/glances/outputs/static/public/glances.js index cc1d2f5e0c98791c8e196ff99b444ad4608a77a6..f64ad34a9eeb8914a15bec2c5055e19e5d72f471 100644 GIT binary patch delta 135 zcmZ2@x|MN15I3|iwlK9Yx3ILZwy?FZw{Wy@ws5s@xA3&^w(zy^w+OTdwg|Ndw}`Ze zwurTeZ;{AaG2L^y1P@nfacWUsVs5H};`G4NQo_@HJJ~p4J=Y7p)T?)1t#6+{xsfhy diff --git a/glances/outputs/static/public/glances.map.js b/glances/outputs/static/public/glances.map.js index 4fc771265c0e7f78a31660f4ce53c6f74a3b8247..c2ef5aa8898df7f6d723d94b0f30bbaa5df6783d 100644 GIT binary patch delta 267 zcmZw8ISv6)00!U;#=h^{Jp0lylh_iSYiK6SBnl!#Uago+D^a|T0}!1kkf_xfjT5L) zDE$XeeC4;juemEM>cO6*%2Kl`sZvc9<))~#`ttI^39NkPy>qHjPNN2m8Z~O#Q~q)M z8}z}62Qyf}3O2BV1DxOjH+aAcKJY^Tf)Ii*L?8+=h(iLBARGoKGHkHTi#V;bsWKVK vLxolLz9?HfiJQIOq+?8XM{M;HM7Fz?Ec*CEAO&g2Ko)Y4hr(g}DYm~qrnhgS delta 254 zcmZw8yAHun00!U`rS3)R-nw66LzF~Jp28@-Bpu9WHZ;ac3}^HJtYSc7Hrgz_0EtKk zqyGU6-}qf_Yi0{eMd%JxUDMjV?o=IUy3sKVMOmF0i8fCxKPMJpEaI|=+ajJFVef~( zVPPIw@PZFG@IwHC5P~p7APPLhAPxx-K!hZuAPpJFLJsmE?aiY+>(gsX66xb5bCh@F jF?~