Module: nagvis Branch: master Commit: 609b930e474a1d0c6f21ef4e8228f21e199e2839 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=609b930e474a1d0c6f21ef4e8228f21e199e2839
Author: Lars Michelsen <[email protected]> Date: Wed Dec 29 21:49:21 2010 +0100 Fixed child displaying of maps/automaps --- share/server/core/classes/objects/NagVisObject.php | 26 +++++++++++-------- .../core/classes/objects/NagVisStatefulObject.php | 3 +- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/share/server/core/classes/objects/NagVisObject.php b/share/server/core/classes/objects/NagVisObject.php index 7ea494e..a8dcf7b 100644 --- a/share/server/core/classes/objects/NagVisObject.php +++ b/share/server/core/classes/objects/NagVisObject.php @@ -206,6 +206,20 @@ class NagVisObject { } } + protected function numMembers() { + // Save the number of members + switch($this->type) { + case 'host': + case 'hostgroup': + case 'servicegroup': + return $this->getNumMembers(); + break; + case 'map': + return $this->getNumStatefulMembers(); + break; + } + } + /** * PUBLIC getObjectInformation() * @@ -245,17 +259,7 @@ class NagVisObject { elseif($this instanceof NagVisStatelessObject) $arr['iconHtmlPath'] = NagVisStatelessObject::$iconHtmlPath; - // Save the number of members - switch($this->type) { - case 'host': - case 'hostgroup': - case 'servicegroup': - $arr['num_members'] = $this->getNumMembers(); - break; - case 'map': - $arr['num_members'] = $this->getNumStatefulMembers(); - break; - } + $arr['num_members'] = $this->numMembers(); /** * FIXME: Find another place for that! This is a bad place for language strings! diff --git a/share/server/core/classes/objects/NagVisStatefulObject.php b/share/server/core/classes/objects/NagVisStatefulObject.php index a5c6abf..893e201 100644 --- a/share/server/core/classes/objects/NagVisStatefulObject.php +++ b/share/server/core/classes/objects/NagVisStatefulObject.php @@ -535,7 +535,8 @@ class NagVisStatefulObject extends NagVisObject { if($bFetchChilds && $this->hasMembers()) foreach($this->getSortedObjectMembers() AS $OBJ) $arr['members'][] = $OBJ->fetchObjectAsChild(); - $arr['num_members'] = count($arr['members']); + + $arr['num_members'] = $this->numMembers(); return $arr; } ------------------------------------------------------------------------------ Learn how Oracle Real Application Clusters (RAC) One Node allows customers to consolidate database storage, standardize their database environment, and, should the need arise, upgrade to a full multi-node Oracle RAC database without downtime or disruption http://p.sf.net/sfu/oracle-sfdevnl _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
