Module: nagvis Branch: master Commit: 89bb7c5eec6a895f9ebe9f2a00e5426a6d768cc9 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=89bb7c5eec6a895f9ebe9f2a00e5426a6d768cc9
Author: LaMi <[email protected]> Date: Thu Dec 3 19:30:13 2009 +0100 Fixed WUI menu links and js error --- share/frontend/wui/classes/WuiViewMap.php | 2 +- share/frontend/wui/js/jsdomenu.inc.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/frontend/wui/classes/WuiViewMap.php b/share/frontend/wui/classes/WuiViewMap.php index aeb108c..c35a356 100644 --- a/share/frontend/wui/classes/WuiViewMap.php +++ b/share/frontend/wui/classes/WuiViewMap.php @@ -74,7 +74,7 @@ class WuiViewMap { 'validMainCfg' => $this->MAP->getJsValidMainConfig(), 'validMapCfg' => $this->MAP->getJsValidMapConfig(), 'mapOptions' => $this->CORE->getMainCfg()->getRuntimeValue('mapOptions'), - 'backupAvailable' => file_exists($this->CORE->getMainCfg()->getValue('paths', 'mapcfg').$this->MAP->MAPCFG->getName().".cfg.bak") + 'backupAvailable' => (file_exists($this->CORE->getMainCfg()->getValue('paths', 'mapcfg').$this->MAP->MAPCFG->getName().".cfg.bak")?'true':'false') ); // Build page based on the template file and the data array diff --git a/share/frontend/wui/js/jsdomenu.inc.js b/share/frontend/wui/js/jsdomenu.inc.js index e0f80b2..e65f9e4 100644 --- a/share/frontend/wui/js/jsdomenu.inc.js +++ b/share/frontend/wui/js/jsdomenu.inc.js @@ -148,7 +148,7 @@ function createjsDOMenu() { // Only add permited objects to the WUI list if(checkUserAllowed(getMapPermissions(mapOptions[i].mapName,mapOptions, "allowedForConfig"),username)) { - submenu_maps_open[iWuiCurSubmenu].addMenuItem(new menuItem(mapOptions[i].mapAlias, mapOptions[i].mapAlias, "link:./index.php?map="+mapOptions[i].mapName, "", "", "")); + submenu_maps_open[iWuiCurSubmenu].addMenuItem(new menuItem(mapOptions[i].mapAlias, mapOptions[i].mapAlias, "link:./index.php?mod=Map&act=edit&show="+mapOptions[i].mapName, "", "", "")); iWuiLinks++; } } @@ -162,7 +162,7 @@ function createjsDOMenu() { // Only add permited objects if(checkUserAllowed(getMapPermissions(mapOptions[i].mapName, mapOptions, "allowedForConfig"), username)) { - submenu_maps_open.addMenuItem(new menuItem(mapOptions[i].mapAlias,mapOptions[i].mapAlias,"link:./index.php?map="+mapOptions[i].mapName,"","","")); + submenu_maps_open.addMenuItem(new menuItem(mapOptions[i].mapAlias,mapOptions[i].mapAlias,"link:./index.php?mod=Map&act=edit&show="+mapOptions[i].mapName,"","","")); } } mainMenu.items.menu_maps_open.setSubMenu(submenu_maps_open); ------------------------------------------------------------------------------ Join us December 9, 2009 for the Red Hat Virtual Experience, a free event focused on virtualization and cloud computing. Attend in-depth sessions from your desk. Your couch. Anywhere. http://p.sf.net/sfu/redhat-sfdev2dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
