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/30 15:03:52 UTC
airavata-php-gateway git commit: AIRAVATA-2457 Hide 'Manage
Notifications' from gateway-providers
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 91c356a8f -> 2f9088df4
AIRAVATA-2457 Hide 'Manage Notifications' from gateway-providers
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/2f9088df
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/2f9088df
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/2f9088df
Branch: refs/heads/develop
Commit: 2f9088df4b6f68c1ec876aa0a9df51f27c9d361e
Parents: 91c356a
Author: Marcus Christie <ma...@iu.edu>
Authored: Fri Jun 30 11:03:40 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Fri Jun 30 11:03:40 2017 -0400
----------------------------------------------------------------------
app/libraries/CommonUtilities.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2f9088df/app/libraries/CommonUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CommonUtilities.php b/app/libraries/CommonUtilities.php
index 9bd5261..b929cbf 100644
--- a/app/libraries/CommonUtilities.php
+++ b/app/libraries/CommonUtilities.php
@@ -325,7 +325,12 @@ class CommonUtilities
</div><div class="slimScrollBar" style=""></div>
<div class="slimScrollRail" style=""></div></div> <!-- / .notifications-list -->';
- if ( Session::has("admin"))
+ // NOTE: There is a legacy issue where gateway-provider users were also
+ // given the admin role. To allow gateway-provider users to see
+ // notifications but not be able to manage them we have to check that
+ // the user doesn't have the gateway-provider role.
+ // if ( Session::has("admin") && !Session::has("gateway-provider"))
+ if ( Session::has("admin") && !Session::has("gateway-provider"))
{
$noticesUI .= '<a href="' . URL::to('/') . '/admin/dashboard/notices" class="notifications-link">Manage Notifications</a>';
}