Module: nagvis Branch: master Commit: 060f401ae738003c4d38b025643881070d75f662 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=060f401ae738003c4d38b025643881070d75f662
Author: Lars Michelsen <[email protected]> Date: Wed Dec 29 20:01:05 2010 +0100 Fixed member changes in hover menus on maps during regular object updates --- share/frontend/nagvis-js/js/frontend.js | 2 +- share/server/core/classes/objects/NagVisMapObj.php | 1 + .../core/classes/objects/NagVisStatefulObject.php | 9 ++++----- share/server/core/classes/objects/NagiosHost.php | 1 + .../core/classes/objects/NagiosHostgroup.php | 1 + .../core/classes/objects/NagiosServicegroup.php | 1 + 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/share/frontend/nagvis-js/js/frontend.js b/share/frontend/nagvis-js/js/frontend.js index 21b2134..74023ff 100644 --- a/share/frontend/nagvis-js/js/frontend.js +++ b/share/frontend/nagvis-js/js/frontend.js @@ -735,7 +735,7 @@ function updateObjects(aMapObjectInformations, aObjs, sType) { // It might happen that some static things like if the host has // members or not change during state change. e.g. when a map is // removed while viewed via the overview page - aObjs[intIndex].getHoverTemplateCode(); + aObjs[intIndex].hover_template_code = null; // Reparse object to map if(sType === 'map') { diff --git a/share/server/core/classes/objects/NagVisMapObj.php b/share/server/core/classes/objects/NagVisMapObj.php index 935b39e..d6cb53e 100644 --- a/share/server/core/classes/objects/NagVisMapObj.php +++ b/share/server/core/classes/objects/NagVisMapObj.php @@ -266,6 +266,7 @@ class NagVisMapObj extends NagVisStatefulObject { if($this->problem_msg) { $this->summary_state = 'ERROR'; $this->summary_output = $this->problem_msg; + $this->clearMembers(); return; } diff --git a/share/server/core/classes/objects/NagVisStatefulObject.php b/share/server/core/classes/objects/NagVisStatefulObject.php index 1a20202..a5c6abf 100644 --- a/share/server/core/classes/objects/NagVisStatefulObject.php +++ b/share/server/core/classes/objects/NagVisStatefulObject.php @@ -531,12 +531,11 @@ class NagVisStatefulObject extends NagVisObject { } // Enable/Disable fetching children - if($bFetchChilds && $this->hasMembers()) { - $arr['members'] = Array(); - foreach($this->getSortedObjectMembers() AS $OBJ) { + $arr['members'] = Array(); + if($bFetchChilds && $this->hasMembers()) + foreach($this->getSortedObjectMembers() AS $OBJ) $arr['members'][] = $OBJ->fetchObjectAsChild(); - } - } + $arr['num_members'] = count($arr['members']); return $arr; } diff --git a/share/server/core/classes/objects/NagiosHost.php b/share/server/core/classes/objects/NagiosHost.php index f51d96d..ca087a9 100644 --- a/share/server/core/classes/objects/NagiosHost.php +++ b/share/server/core/classes/objects/NagiosHost.php @@ -141,6 +141,7 @@ class NagiosHost extends NagVisStatefulObject { if($this->problem_msg) { $this->summary_state = 'ERROR'; $this->summary_output = $this->problem_msg; + $this->members = Array(); return; } diff --git a/share/server/core/classes/objects/NagiosHostgroup.php b/share/server/core/classes/objects/NagiosHostgroup.php index a1da6bb..fa999e3 100644 --- a/share/server/core/classes/objects/NagiosHostgroup.php +++ b/share/server/core/classes/objects/NagiosHostgroup.php @@ -86,6 +86,7 @@ class NagiosHostgroup extends NagVisStatefulObject { if($this->problem_msg) { $this->summary_state = 'ERROR'; $this->summary_output = $this->problem_msg; + $this->members = Array(); return; } diff --git a/share/server/core/classes/objects/NagiosServicegroup.php b/share/server/core/classes/objects/NagiosServicegroup.php index d1df6d2..1b50bd6 100644 --- a/share/server/core/classes/objects/NagiosServicegroup.php +++ b/share/server/core/classes/objects/NagiosServicegroup.php @@ -85,6 +85,7 @@ class NagiosServicegroup extends NagVisStatefulObject { if($this->problem_msg) { $this->summary_state = 'ERROR'; $this->summary_output = $this->problem_msg; + $this->members = Array(); return; } ------------------------------------------------------------------------------ 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
