mirror of
https://github.com/nicolargo/glances.git
synced 2024-11-24 13:23:12 +03:00
xMerge branch 'develop' of https://github.com/nicolargo/glances into develop
This commit is contained in:
commit
b9d37ecaf2
@ -78,10 +78,10 @@ export default function GlancesPluginProcesslistController($scope, GlancesStats,
|
|||||||
process.cmdline = process.name;
|
process.cmdline = process.name;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.isWindows) {
|
if (data.isWindows && process.username !== null) {
|
||||||
process.username = _.last(process.username.split('\\'));
|
process.username = _.last(process.username.split('\\'));
|
||||||
}
|
}
|
||||||
|
|
||||||
vm.processes.push(process);
|
vm.processes.push(process);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
4
glances/outputs/static/public/glances.js
vendored
4
glances/outputs/static/public/glances.js
vendored
@ -41949,10 +41949,10 @@ function GlancesPluginProcesslistController($scope, GlancesStats, GlancesPluginH
|
|||||||
process.cmdline = process.name;
|
process.cmdline = process.name;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.isWindows) {
|
if (data.isWindows && process.username !== null) {
|
||||||
process.username = _.last(process.username.split('\\'));
|
process.username = _.last(process.username.split('\\'));
|
||||||
}
|
}
|
||||||
|
|
||||||
vm.processes.push(process);
|
vm.processes.push(process);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
2
glances/outputs/static/public/glances.map.js
vendored
2
glances/outputs/static/public/glances.map.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user