Module: nagvis Branch: master Commit: baaba23a43639aaf0da3fad2652faabc9e388e21 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=baaba23a43639aaf0da3fad2652faabc9e388e21
Author: Lars Michelsen <[email protected]> Date: Mon Aug 16 08:14:11 2010 +0200 Fixed status icon of automaps on overview page --- share/server/core/classes/CoreModGeneral.php | 3 ++- share/server/core/classes/GlobalIndexPage.php | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/share/server/core/classes/CoreModGeneral.php b/share/server/core/classes/CoreModGeneral.php index b8c0d0b..aea238d 100644 --- a/share/server/core/classes/CoreModGeneral.php +++ b/share/server/core/classes/CoreModGeneral.php @@ -195,7 +195,6 @@ class CoreModGeneral extends CoreModule { // Save the preview mode (Enables/Disables printing of errors) $aOpts['preview'] = 0; - // FIXME: Maybe this can be a view?! I'm unsure about this... $MAP = new NagVisAutoMap($this->CORE, $MAPCFG, $BACKEND, $aOpts, !IS_VIEW); $OBJ = $MAP->MAPOBJ; break; @@ -204,10 +203,12 @@ class CoreModGeneral extends CoreModule { break; } + // Load configured options $arr = $MAPCFG->getDefinitions('global'); unset($arr[0]['type']); unset($arr[0]['object_id']); + // Load default options and merge $typeDefs = $MAPCFG->getTypeDefaults('global'); foreach($typeDefs AS $key => $default) if(!isset($arr[0][$key])) diff --git a/share/server/core/classes/GlobalIndexPage.php b/share/server/core/classes/GlobalIndexPage.php index 2096e7e..cda7964 100644 --- a/share/server/core/classes/GlobalIndexPage.php +++ b/share/server/core/classes/GlobalIndexPage.php @@ -170,6 +170,8 @@ class GlobalIndexPage { } } + $MAP->MAPOBJ->fetchIcon(); + $aMaps[] = array_merge($MAP->MAPOBJ->parseJson(), $map); } else { // Only handle thumbnail image when told to do so ------------------------------------------------------------------------------ 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
