Module: nagvis Branch: nagvis-1.4 Commit: 3747f52648a8ed6300fd54a6ad2259df2d17c461 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=3747f52648a8ed6300fd54a6ad2259df2d17c461
Author: LaMi <[email protected]> Date: Thu Feb 4 19:17:11 2010 +0100 #174 Setting hover_childs_limit to -1 disables the limitation of the hover childs --- .../docs/en_US/map_config_format_description.html | 12 ++++++------ nagvis/nagvis/includes/classes/GlobalMainCfg.php | 2 +- nagvis/nagvis/includes/classes/GlobalMapCfg.php | 12 ++++++------ .../includes/classes/objects/NagVisObject.php | 2 +- nagvis/nagvis/includes/js/hover.js | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/nagvis/docs/en_US/map_config_format_description.html b/nagvis/docs/en_US/map_config_format_description.html index b8ba7b5..f2401cc 100644 --- a/nagvis/docs/en_US/map_config_format_description.html +++ b/nagvis/docs/en_US/map_config_format_description.html @@ -116,7 +116,7 @@ <td> hover_childs_show </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Enable/Disable displaying child objects </td> </tr> <tr> - <td> hover_childs_limit </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Number of maximum children to be displayed </td> + <td> hover_childs_limit </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Number of maximum children to be displayed. Set to -1 to disable the limit.</td> </tr> <tr> <td> hover_childs_order </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Order direction of child objects </td> @@ -221,7 +221,7 @@ <td> hover_childs_order </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Order direction of child objects </td> </tr> <tr> - <td> hover_childs_limit </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Maximum number of children to be displayed </td> + <td> hover_childs_limit </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Maximum number of children to be displayed. Set to -1 to disable the limit.</td> </tr> <tr> <td> iconset </td><td> inherited (<a href="#global">global</a>) </td><td> Special iconset. Is inherited from global paragraph if not specified. </td> @@ -346,7 +346,7 @@ <td> hover_childs_order </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Order direction of child objects </td> </tr> <tr> - <td> hover_childs_limit </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Maximum number of children to be displayed </td> + <td> hover_childs_limit </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Maximum number of children to be displayed. Set to -1 to disable the limit.</td> </tr> <tr> <td> iconset </td><td> inherited (<a href="#global">global</a>) </td><td> Special iconset. Is inherited from global paragraph if not specified. </td> @@ -453,7 +453,7 @@ <td> hover_childs_order </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Order direction of child objects </td> </tr> <tr> - <td> hover_childs_limit </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Maximum number of children to be displayed </td> + <td> hover_childs_limit </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Maximum number of children to be displayed. Set to -1 to disable the limit.</td> </tr> <tr> <td> iconset </td><td> inherited (<a href="#global">global</a>) </td><td> Special iconset. Is inherited from global paragraph if not specified. </td> @@ -563,7 +563,7 @@ <td> hover_childs_order </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Order direction of child objects </td> </tr> <tr> - <td> hover_childs_limit </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Number of maximum children to be displayed </td> + <td> hover_childs_limit </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Number of maximum children to be displayed. Set to -1 to disable the limit.</td> </tr> <tr> <td> iconset </td><td> inherited (<a href="#global">global</a>) </td><td> Special iconset. Is inherited from global paragraph if not specified. </td> @@ -667,7 +667,7 @@ <td> hover_childs_order </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Order direction of child objects </td> </tr> <tr> - <td> hover_childs_limit </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Number of maximum children to be displayed </td> + <td> hover_childs_limit </td><td> inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>) </td><td> Number of maximum children to be displayed. Set to -1 to disable the limit.</td> </tr> <tr> <td> iconset </td><td> inherited (<a href="#global">global</a>) </td><td> Special iconset. Is inherited from global paragraph if not specified. </td> diff --git a/nagvis/nagvis/includes/classes/GlobalMainCfg.php b/nagvis/nagvis/includes/classes/GlobalMainCfg.php index 6d85c3e..f20b454 100644 --- a/nagvis/nagvis/includes/classes/GlobalMainCfg.php +++ b/nagvis/nagvis/includes/classes/GlobalMainCfg.php @@ -239,7 +239,7 @@ class GlobalMainCfg { 'hoverchildslimit' => Array('must' => 0, 'editable' => 1, 'default' => '10', - 'match' => MATCH_INTEGER), + 'match' => MATCH_INTEGER_PRESIGN), 'hoverchildsorder' => Array('must' => 0, 'editable' => 1, 'default' => 'asc', diff --git a/nagvis/nagvis/includes/classes/GlobalMapCfg.php b/nagvis/nagvis/includes/classes/GlobalMapCfg.php index 29ee378..15f4e54 100644 --- a/nagvis/nagvis/includes/classes/GlobalMapCfg.php +++ b/nagvis/nagvis/includes/classes/GlobalMapCfg.php @@ -175,7 +175,7 @@ class GlobalMapCfg { 'depends_value' => '1'), 'hover_childs_limit' => Array('must' => 0, 'default' => $this->CORE->MAINCFG->getValue('defaults', 'hoverchildslimit'), - 'match' => MATCH_INTEGER, + 'match' => MATCH_INTEGER_PRESIGN, 'depends_on' => 'hover_menu', 'depends_value' => '1'), 'hover_childs_order' => Array('must' => 0, @@ -352,7 +352,7 @@ class GlobalMapCfg { 'depends_value' => '1'), 'hover_childs_limit' => Array('must' => 0, 'default' => '', - 'match' => MATCH_INTEGER, + 'match' => MATCH_INTEGER_PRESIGN, 'depends_on' => 'hover_menu', 'depends_value' => '1'), @@ -505,7 +505,7 @@ class GlobalMapCfg { 'depends_value' => '1'), 'hover_childs_limit' => Array('must' => 0, 'default' => '', - 'match' => MATCH_INTEGER, + 'match' => MATCH_INTEGER_PRESIGN, 'depends_on' => 'hover_menu', 'depends_value' => '1'), @@ -675,7 +675,7 @@ class GlobalMapCfg { 'depends_value' => '1'), 'hover_childs_limit' => Array('must' => 0, 'default' => '', - 'match' => MATCH_INTEGER, + 'match' => MATCH_INTEGER_PRESIGN, 'depends_on' => 'hover_menu', 'depends_value' => '1'), @@ -823,7 +823,7 @@ class GlobalMapCfg { 'depends_value' => '1'), 'hover_childs_limit' => Array('must' => 0, 'default' => '', - 'match' => MATCH_INTEGER, + 'match' => MATCH_INTEGER_PRESIGN, 'depends_on' => 'hover_menu', 'depends_value' => '1'), @@ -965,7 +965,7 @@ class GlobalMapCfg { 'depends_value' => '1'), 'hover_childs_limit' => Array('must' => 0, 'default' => '', - 'match' => MATCH_INTEGER, + 'match' => MATCH_INTEGER_PRESIGN, 'depends_on' => 'hover_menu', 'depends_value' => '1'), diff --git a/nagvis/nagvis/includes/classes/objects/NagVisObject.php b/nagvis/nagvis/includes/classes/objects/NagVisObject.php index f40cf4d..d274a69 100644 --- a/nagvis/nagvis/includes/classes/objects/NagVisObject.php +++ b/nagvis/nagvis/includes/classes/objects/NagVisObject.php @@ -363,7 +363,7 @@ class NagVisObject { $iNumObjects = count($aTmpMembers); // Loop all child object until all looped or the child limit is reached - for($i = 0, $iEnum = 0; $iEnum <= $this->hover_childs_limit && $i < $iNumObjects; $i++) { + for($i = 0, $iEnum = 0; (($this->hover_childs_limit >= 0 && $iEnum <= $this->hover_childs_limit) || $this->hover_childs_limit == -1) && $i < $iNumObjects; $i++) { $sType = $aTmpMembers[$i]->getType(); // Only get the member when this is no loop diff --git a/nagvis/nagvis/includes/js/hover.js b/nagvis/nagvis/includes/js/hover.js index 71390ac..2093681 100644 --- a/nagvis/nagvis/includes/js/hover.js +++ b/nagvis/nagvis/includes/js/hover.js @@ -60,8 +60,8 @@ function replaceHoverTemplateChildMacros(oObj, sTemplateCode) { if(rowHtmlCode != '' && oObj.members && oObj.members.length > 0) { // Loop all child objects until all looped or the child limit is reached - for(var i = 0, len1 = oObj.conf.hover_childs_limit, len2 = oObj.members.length; i <= len1 && i < len2; i++) { - if(i < oObj.conf.hover_childs_limit) { + for(var i = 0, len1 = oObj.conf.hover_childs_limit, len2 = oObj.members.length; (len1 == -1 || (len1 >= 0 && i <= len1)) && i < len2; i++) { + if(len1 == -1 || (len1 >= 0 && i < len1)) { // Try to catch some error if(!oObj.members[i].conf) { eventlog("hover-parsing", "critical", "Problem while parsing child in hover template (t:" & oObj.conf.type & " n:" & oObj.conf.name &")"); ------------------------------------------------------------------------------ The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
