vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 15:39:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixes #1016

Browse source
This commit is contained in:
emanuele-f 2017-03-07 12:06:09 +01:00
parent b68b571fd5
commit 3bb68a0f2f
4 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
scripts/lua/get_grouped_hosts_data.lua
View file

@ -277,7 +277,7 @@ for key,value in pairs(stats_by_group_col) do
v = stats_by_group_col[key]
if((key ~= nil) and (v ~= nil)) then
if(sortColumn == "column_id") then
vals[key] = key
vals[key] = v["id"]
elseif(sortColumn == "column_name") then
vals[key] = v["name"]
elseif(sortColumn == "column_hosts") then
@ -309,11 +309,21 @@ else
funct = rev
end
num = 0
for _key, _value in pairsByValues(vals, funct) do
if((_key ~= nil) and (not(_key == ""))) then
value = stats_by_group_col[_key]
local iterator
if sortColumn == "column_id" then
-- Sort for this column is already provided by C, only the sort order can be reversed here
iterator = pairsByKeys
else
-- We provide our own sort
iterator = pairsByValues
end
num = 0
for _key, _val in iterator(vals, funct) do
value = stats_by_group_col[_key]
-- e.g. this is empty for hosts without a country
if not isEmptyString(value["id"]) then
if(to_skip > 0) then
to_skip = to_skip-1
else