Module: nagvis Branch: master Commit: 1059d15be5a020317c48ab1d37ea47456fb893d1 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=1059d15be5a020317c48ab1d37ea47456fb893d1
Author: Lars Michelsen <[email protected]> Date: Sun Sep 26 18:09:37 2010 +0200 Changed hover child output a bit --- share/frontend/nagvis-js/js/frontend.js | 4 +--- .../core/classes/objects/NagVisStatefulObject.php | 17 ++++++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/share/frontend/nagvis-js/js/frontend.js b/share/frontend/nagvis-js/js/frontend.js index b9e7ff8..c741727 100644 --- a/share/frontend/nagvis-js/js/frontend.js +++ b/share/frontend/nagvis-js/js/frontend.js @@ -466,13 +466,11 @@ function getBackgroundColor(oObj) { var sColor; // When state is PENDING, OK, UP, set default background color - if(oObj.summary_state == 'PENDING' || oObj.summary_state == 'OK' || oObj.summary_state == 'UP') + if(!oObj.summary_state || oObj.summary_state == 'PENDING' || oObj.summary_state == 'OK' || oObj.summary_state == 'UP') sColor = oPageProperties.background_color; else sColor = oStates[oObj.summary_state].bgcolor; - eventlog("background", "debug", "State: "+oObj.summary_state+" Color is: "+sColor); - oObj = null; return sColor; diff --git a/share/server/core/classes/objects/NagVisStatefulObject.php b/share/server/core/classes/objects/NagVisStatefulObject.php index 8708866..76e70df 100644 --- a/share/server/core/classes/objects/NagVisStatefulObject.php +++ b/share/server/core/classes/objects/NagVisStatefulObject.php @@ -850,14 +850,17 @@ class NagVisStatefulObject extends NagVisObject { NagVisStatefulObject::$langChildStates = $this->CORE->getLang()->getText('childStatesAre'); $this->summary_output .= NagVisStatefulObject::$langChildStates.' '; - foreach($arrStates AS $state => $num) { - if($num > 0) { + foreach($arrStates AS $state => $num) + if($num > 0) $this->summary_output .= $num.' '.$state.', '; - } - } - - // Remove last comma - $this->summary_output = rtrim($this->summary_output, ', ').' '.$objLabel.'.'; + + // If some has been added remove last comma, else add a simple 0 + if(substr($this->summary_output, -2, 2) == ', ') + $this->summary_output = rtrim($this->summary_output, ', '); + else + $this->summary_output .= '0 '; + + $this->summary_output .= ' '.$objLabel.'.'; } /** ------------------------------------------------------------------------------ Start uncovering the many advantages of virtual appliances and start using them to simplify application deployment and accelerate your shift to cloud computing. http://p.sf.net/sfu/novell-sfdev2dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
