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

Fix to remove toggle buttons exceeding the max value

Browse source 
Fix to remove comma on Lua (non JIT)
Minor cleanup
This commit is contained in:
Luca Deri 2018-09-22 09:05:40 +02:00
parent 22bdd1e462
commit bc79a6f41e
4 changed files with 35 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

30
scripts/lua/modules/lua_utils.lua
View file

@ -2782,7 +2782,7 @@ FMT_TO_DATA_TIME = {
-- ###########################################
-- Note: use data-min and data-max to setup ranges
function makeResolutionButtons(fmt_to_data, ctrl_id, fmt, value, extra)
function makeResolutionButtons(fmt_to_data, ctrl_id, fmt, value, extra, max_val)
local extra = extra or {}
local html_lines = {}
@ -2794,7 +2794,7 @@ function makeResolutionButtons(fmt_to_data, ctrl_id, fmt, value, extra)
string.gsub(fmt, ".", function(k)
local v = fmt_to_data[k]
if v ~= nil then
divisors[#divisors + 1] = {k=k, v=v.value}
divisors[#divisors + 1] = {k=k, v=v.value}
end
end)
end
@ -2817,18 +2817,21 @@ function makeResolutionButtons(fmt_to_data, ctrl_id, fmt, value, extra)
string.gsub(fmt, ".", function(k)
local v = fmt_to_data[k]
if v ~= nil then
local line = {}
line[#line+1] = [[<label class="btn]]
if selected == k then
line[#line+1] = [[ btn-primary active]]
else
line[#line+1] = [[ btn-default]]
end
line[#line+1] = [[ btn-sm"><input data-resol="]] .. k .. [[" value="]] .. v.value .. [[" title="]] .. v.label .. [[" name="opt_resbt_]] .. k .. [[_]] .. ctrl_id .. [[" autocomplete="off" type="radio"]]
if selected == k then line[#line+1] = [[ checked="checked"]] end
line[#line+1] = [[/>]] .. v.label .. [[</label>]]
local line = {}
html_lines[#html_lines+1] = table.concat(line, "")
if((max_val == nil) or (v.value < max_val)) then
line[#line+1] = [[<label class="btn]]
if selected == k then
line[#line+1] = [[ btn-primary active]]
else
line[#line+1] = [[ btn-default]]
end
line[#line+1] = [[ btn-sm"><input data-resol="]] .. k .. [[" value="]] .. truncate(v.value) .. [[" title="]] .. v.label .. [[" name="opt_resbt_]] .. k .. [[_]] .. ctrl_id .. [[" autocomplete="off" type="radio"]]
if selected == k then line[#line+1] = [[ checked="checked"]] end
line[#line+1] = [[/>]] .. v.label .. [[</label>]]
html_lines[#html_lines+1] = table.concat(line, "")
end
end
end)
@ -3285,4 +3288,3 @@ end
-- defined in this file
--
http_lint = require "http_lint"