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/06/28 21:16:57 UTC
airavata-php-gateway git commit: AIRAVATA-2457 Allow gateway-provider
to see notices
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop a3cd053c4 -> 7c3d19a8c
AIRAVATA-2457 Allow gateway-provider to see notices
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/7c3d19a8
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/7c3d19a8
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/7c3d19a8
Branch: refs/heads/develop
Commit: 7c3d19a8c4520ed39aa3a46c3ee0742ef5d09009
Parents: a3cd053
Author: Marcus Christie <ma...@iu.edu>
Authored: Wed Jun 28 17:13:49 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Wed Jun 28 17:16:16 2017 -0400
----------------------------------------------------------------------
app/libraries/CommonUtilities.php | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/7c3d19a8/app/libraries/CommonUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CommonUtilities.php b/app/libraries/CommonUtilities.php
index 8fb65ca..9bd5261 100644
--- a/app/libraries/CommonUtilities.php
+++ b/app/libraries/CommonUtilities.php
@@ -210,18 +210,17 @@ class CommonUtilities
$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