vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-05 02:16:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Allow configuration of custom sub-interfaces only when there is no dynamic disaggregation mode configured

Browse source
This commit is contained in:
Alfredo Cardigliano 2019-09-25 12:33:14 +02:00
parent ff36d16968
commit aacbf945db
2 changed files with 71 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

37
scripts/lua/if_stats.lua
View file

@ -353,7 +353,7 @@ if(isAdministrator()) then
end
end
if(isAdministrator() and ntop.isEnterprise() and not ifstats.isDynamic) then
if(isAdministrator() and ntop.isEnterprise() and not ifstats.isDynamic) and isEmptyString(ntop.getCache(disaggregation_criterion_key)) then
if(page == "sub_interfaces") then
print("\n<li class=\"active\"><a href=\"#\"><i class=\"fa fa-code-fork\"></i></a></li>\n")
else
@ -1683,14 +1683,22 @@ elseif(page == "config") then
i18n("prefs.ingress_vrf_id")
}
local values = {
"none",
"vlan",
"probe_ip",
"iface_idx",
"ingress_iface_idx",
"ingress_vrf_id"
}
local values = {}
if is_packet_interface then
values = {
"none",
"vlan"
}
else
values = {
"none",
"vlan",
"probe_ip",
"iface_idx",
"ingress_iface_idx",
"ingress_vrf_id"
}
end
print [[
<tr>
@ -1706,13 +1714,16 @@ elseif(page == "config") then
print[[
</select>
]]
print ("<br><br><small><p><b>"..i18n("notes").."</b><ul>"..
print ("<br><br><small><p><b>"..i18n("notes").."</b><ul>"..
"<li>"..i18n("prefs.dynamic_interfaces_creation_description").."</li>"..
"<li>"..i18n("prefs.dynamic_interfaces_creation_note_0").."</li>"..
"<li>"..i18n("prefs.dynamic_interfaces_creation_note_1").."</li>"..
"<li>"..i18n("prefs.dynamic_interfaces_creation_note_2").."</li>"..
"<li>"..i18n("prefs.dynamic_interfaces_creation_note_3").."</li></ul></small>")
"<li>"..i18n("prefs.dynamic_interfaces_creation_note_1").."</li>")
if not is_packet_interface then
print("<li>"..i18n("prefs.dynamic_interfaces_creation_note_2").."</li>"..
"<li>"..i18n("prefs.dynamic_interfaces_creation_note_3").."</li>")
end
print [[
</ul></small>
</td>
</tr>]]
end