Show dashboard link if gateway-provider
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/eb48575e Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/eb48575e Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/eb48575e Branch: refs/heads/develop Commit: eb48575ed9a61cbe7cc1a07ecec2af760a0db3ae Parents: d774332 Author: Marcus Christie <[email protected]> Authored: Sat Jul 1 20:42:49 2017 -0400 Committer: Marcus Christie <[email protected]> Committed: Sat Jul 1 20:42:49 2017 -0400 ---------------------------------------------------------------------- app/libraries/CommonUtilities.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/eb48575e/app/libraries/CommonUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/CommonUtilities.php b/app/libraries/CommonUtilities.php index abb2d8b..d8eae6c 100644 --- a/app/libraries/CommonUtilities.php +++ b/app/libraries/CommonUtilities.php @@ -219,13 +219,10 @@ class CommonUtilities $navbar .= CommonUtilities::get_notices_ui( $notices); } - if( Session::has("gateway-provider")) - { - if (Session::has("admin") || Session::has("admin-read-only") ) - $navbar .= '<li class="' . $active . '"><a href="' . URL::to("/") . '/admin/dashboard"><span class="glyphicon glyphicon-user"></span>Admin Dashboard</a></li>'; - else - $navbar .= '<li class="' . $active . '"><a href="' . URL::to("/") . '/account/dashboard"><span class="glyphicon glyphicon-user"></span>Dashboard</a></li>'; - } + if ( (Session::has("admin") || Session::has("admin-read-only")) && !Session::has("gateway-provider") ) + $navbar .= '<li class="' . $active . '"><a href="' . URL::to("/") . '/admin/dashboard"><span class="glyphicon glyphicon-user"></span>Admin Dashboard</a></li>'; + else + $navbar .= '<li class="' . $active . '"><a href="' . URL::to("/") . '/account/dashboard"><span class="glyphicon glyphicon-user"></span>Dashboard</a></li>'; $navbar .= '<li class="dropdown' . (Session::get("nav-active") == 'user-menu' ? ' active' : '') . '">
