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

fix for system view

Browse source
This commit is contained in:
gabryon99 2020-03-23 10:29:45 +01:00
parent 654ea9ec08
commit c0f30310f7
21 changed files with 79 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scripts/lua/admin/get_device_protocols.lua
View file

@ -11,7 +11,7 @@ require "lua_utils"
local presets_utils = require "presets_utils"
local json = require("dkjson")
sendHTTPContentTypeHeader('text/html')
sendHTTPContentTypeHeader('text/html', nil, nil, getBothViewFlag())
if not isAdministrator() then
return
@ -83,8 +83,8 @@ local function matchesPolicyFilter(item_id)
if policy_filter ~= presets_utils.DEFAULT_ACTION then -- != default
return false
end
elseif policy.clientActionId ~= nil and policy_filter ~= policy.clientActionId and
policy.serverActionId ~= nil and policy_filter ~= policy.serverActionId then
elseif policy.clientActionId ~= nil and policy_filter ~= policy.clientActionId and
policy.serverActionId ~= nil and policy_filter ~= policy.serverActionId then
return false
end
@ -127,7 +127,7 @@ for item_name, item_id in pairs(items) do
if sortColumn == "column_" or sortColumn == "column_ndpi_application" then
sorter[item_name] = item_name
elseif sortColumn == "column_ndpi_category" then
sorter[item_name] = cat.name
sorter[item_name] = cat.name
end
::continue::
@ -159,14 +159,14 @@ for sorted_item, _ in pairsByValues(sorter, sOrder) do
((conf ~= nil and conf.clientActionId ~= nil) and conf.clientActionId == action.id) then
checked = 'checked'
end
cr = cr..'<label class="radio-inline"><input type="radio" name="'..field_id..'_client_action" value="'..action.id..'" '..checked..'><span style="font-size: 16px;">'..action.icon..'</span></label>'
cr = cr..'<label class="radio-inline mx-2"><input type="radio" name="'..field_id..'_client_action" value="'..action.id..'" '..checked..'><span class="mx-1" style="font-size: 16px;">'..action.icon..'</span></label>'
checked = ''
if ((conf == nil or conf.serverActionId == nil) and action.id == presets_utils.DEFAULT_ACTION) or
((conf ~= nil and conf.serverActionId ~= nil) and conf.serverActionId == action.id) then
checked = 'checked'
end
sr = sr..'<label class="radio-inline"><input type="radio" name="'..field_id..'_server_action" value="'..action.id..'" '..checked..'><span style="font-size: 16px;">'..action.icon..'</span></label>'
sr = sr..'<label class="radio-inline mx-2"><input type="radio" name="'..field_id..'_server_action" value="'..action.id..'" '..checked..'><span class="mx-1" style="font-size: 16px;">'..action.icon..'</span></label>'
end
record["column_client_policy"] = cr