You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/08/03 17:03:24 UTC

[33/50] airavata-php-gateway git commit: AIRAVATA-2486 gateway-users should get /account/dashboard link

AIRAVATA-2486 gateway-users should get /account/dashboard link


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/469308f4
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/469308f4
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/469308f4

Branch: refs/heads/master
Commit: 469308f4c03d3c827294441322a4ecae1f53dfa4
Parents: c56680a
Author: Marcus Christie <ma...@iu.edu>
Authored: Sun Jul 9 01:35:26 2017 -0500
Committer: Marcus Christie <ma...@iu.edu>
Committed: Sun Jul 9 01:35:26 2017 -0500

----------------------------------------------------------------------
 app/libraries/CommonUtilities.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/469308f4/app/libraries/CommonUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CommonUtilities.php b/app/libraries/CommonUtilities.php
index 238706c..80a432d 100644
--- a/app/libraries/CommonUtilities.php
+++ b/app/libraries/CommonUtilities.php
@@ -221,8 +221,10 @@ class CommonUtilities
 
             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
+            else if ( Session::has("gateway-provider"))
                 $navbar .= '<li class="' . $active . '"><a href="' . URL::to("/") . '/admin/dashboard"><span class="glyphicon glyphicon-user"></span>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' : '') . '">