Merge remote-tracking branch 'upstream/dev' into dev

This commit is contained in:
Simone Mainardi 2015-11-07 10:54:13 +01:00
commit 164f94dd90
24 changed files with 379 additions and 645 deletions

View file

@ -340,6 +340,8 @@ function drawRRD(ifid, host, rrdFile, zoomLevel, baseurl, show_timeseries,
end
if ntop.isPro() then
_ifstats = interface.getStats()
if(_ifstats.isView == true) then topArray = nil end
drawProGraph(ifid, host, rrdFile, zoomLevel, baseurl, show_timeseries, selectedEpoch, selected_epoch_sanitized, topArray)
return
end