Module: nagvis Branch: master Commit: 0f7b4a9b5567f528ac22fb60c5b68304575c1791 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=0f7b4a9b5567f528ac22fb60c5b68304575c1791
Author: Lars Michelsen <[email protected]> Date: Mon Aug 16 00:14:18 2010 +0200 Fixed missing hover menu childs after first refresh of objects on overview page --- share/server/core/classes/CoreModGeneral.php | 4 ++++ share/server/core/classes/objects/NagVisObject.php | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/server/core/classes/CoreModGeneral.php b/share/server/core/classes/CoreModGeneral.php index 4de7ddb..8f59592 100644 --- a/share/server/core/classes/CoreModGeneral.php +++ b/share/server/core/classes/CoreModGeneral.php @@ -207,6 +207,10 @@ class CoreModGeneral extends CoreModule { $arr = $MAPCFG->getDefinitions('global'); unset($arr[0]['type']); unset($arr[0]['object_id']); + $typeDefs = $MAPCFG->getTypeDefaults('global'); + foreach($typeDefs AS $key => $default) + if(!isset($arr[0][$key])) + $arr[0][$key] = $default; $OBJ->setConfiguration($arr[0]); $OBJ->setObjectId($arrObjId[$i]); diff --git a/share/server/core/classes/objects/NagVisObject.php b/share/server/core/classes/objects/NagVisObject.php index 14645c2..7218654 100644 --- a/share/server/core/classes/objects/NagVisObject.php +++ b/share/server/core/classes/objects/NagVisObject.php @@ -403,12 +403,8 @@ class NagVisObject { $iNumObjects = count($aTmpMembers); // Loop all child object until all looped or the child limit is reached - for($i = 0, $iEnum = 0; $this->belowHoverChildsLimit($iEnum) && $i < $iNumObjects; $i++) { + for($i = 0; $this->belowHoverChildsLimit($i) && $i < $iNumObjects; $i++) { $arr[] = $aTmpMembers[$i]; - - // Only count objects which are added to the list for checking - // reached hover_childs_limit - $iEnum++; } return $arr; ------------------------------------------------------------------------------ This SF.net email is sponsored by Make an app they can't live without Enter the BlackBerry Developer Challenge http://p.sf.net/sfu/RIM-dev2dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
