Module: nagvis Branch: master Commit: 1c566ec08f54d5b42d7aeb40d5ba29374d31d768 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=1c566ec08f54d5b42d7aeb40d5ba29374d31d768
Author: LaMi <[email protected]> Date: Tue Feb 16 21:49:06 2010 +0100 Not allowed users don't see the WUI links in header menu --- .../nagvis-js/classes/NagVisHeaderMenu.php | 7 +++++++ share/userfiles/templates/default.header.html | 9 +++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php b/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php index 4e2f7c3..464cab3 100644 --- a/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php +++ b/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php @@ -128,6 +128,7 @@ class NagVisHeaderMenu { // Build map list + $permEditAnyMap = False; $aMaps = Array(); foreach($this->CORE->getAvailableMaps() AS $mapName) { $MAPCFG1 = new NagVisMapCfg($this->CORE, $mapName); @@ -141,6 +142,11 @@ class NagVisHeaderMenu { $aMaps[$mapName]['mapName'] = $MAPCFG1->getName(); $aMaps[$mapName]['mapAlias'] = $MAPCFG1->getValue('global', '0', 'alias'); $aMaps[$mapName]['urlParams'] = ''; + $aMaps[$mapName]['permittedEdit'] = $this->CORE->getAuthorization()->isPermitted('Map', 'edit', $mapName); + + if($aMaps[$mapName]['permittedEdit']) { + $permEditAnyMap = true; + } // auto select current map if($this->OBJ !== null && ($this->aMacros['mod'] == 'Map' || $this->aMacros['mod'] == 'AutoMap') && $mapName == $this->OBJ->getName()) { @@ -152,6 +158,7 @@ class NagVisHeaderMenu { } } $this->aMacros['maps'] = $aMaps; + $this->aMacros['permissionEditAnyMap'] = $permEditAnyMap; // Build automap list $aAutomaps = Array(); diff --git a/share/userfiles/templates/default.header.html b/share/userfiles/templates/default.header.html index fe5154f..95f06a4 100644 --- a/share/userfiles/templates/default.header.html +++ b/share/userfiles/templates/default.header.html @@ -12,15 +12,20 @@ {if count($maps) > 0} {foreach $maps map}<li> <a class="left" href="{$pathBase}/frontend/nagvis-js/index.php?mod=Map&act=view&show={$map.mapName}{$map.urlParams}">{$map.mapAlias}</a> - <a class="right" href="{$pathBase}/frontend/wui/index.php?mod=Map&act=edit&show={$map.mapName}{$map.urlParams}">Edit</a> + {if $map.permittedEdit}<a class="right" href="{$pathBase}/frontend/wui/index.php?mod=Map&act=edit&show={$map.mapName}{$map.urlParams}">Edit</a> + {else}<a class="right"> </a>{/if} </li>{/foreach} <li class="spacer"><hr /></li> {/if} {if count($automaps) > 0} {foreach $automaps map}<li><a href="{$pathBase}/frontend/nagvis-js/index.php?mod=AutoMap&act=view&show={$map.mapName}{$map.urlParams}">{$map.mapAlias}</a></li>{/foreach} - <li class="spacer"><hr /></li> {/if} + {if $permissionEditAnyMap} + <li class="spacer"><hr /></li> <li><a href="{$pathBase}/frontend/wui/index.php" class="underline">{$langWui}</a></li> + {else} + <li class="spacer underline"></li> + {/if} </ul> </dd> </dl> ------------------------------------------------------------------------------ SOLARIS 10 is the OS for Data Centers - provides features such as DTrace, Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW http://p.sf.net/sfu/solaris-dev2dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
