Skip to content
Permalink
Browse files
Merge remote-tracking branch 'origin/develop' into develop
  • Loading branch information
scnakandala committed Jun 28, 2017
2 parents b1dcbdf + 7c3d19a commit 5d9bb195ea028321869fb134e154b046da56a5f8
Showing 1 changed file with 9 additions and 10 deletions.
@@ -210,18 +210,17 @@ public static function create_nav_bar()
$active = " active ";
}

if( !Session::has("gateway-provider"))
{
if( Session::has('authorized-user') || Session::has('admin') || Session::has('admin-read-only')){
//notification bell
$notices = array();
if (CommonUtilities::isAiravataUp()) {
$notices = CommonUtilities::get_all_notices();
}
$navbar .= CommonUtilities::get_notices_ui( $notices);
if( Session::has('authorized-user') || Session::has('admin') || Session::has('admin-read-only') || Session::has('gateway-provider')){
//notification bell
$notices = array();
if (CommonUtilities::isAiravataUp()) {
$notices = CommonUtilities::get_all_notices();
}
$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

0 comments on commit 5d9bb19

Please sign in to comment.