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/02/01 13:36:49 UTC
[20/21] airavata-php-gateway git commit: appending the last commit
appending the last commit
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/3c945375
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/3c945375
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/3c945375
Branch: refs/heads/dreg-gateway
Commit: 3c94537529b0f7f6c6614ec66cc92b5bc7927360
Parents: e84cc14
Author: scnakandala <su...@gmail.com>
Authored: Fri Jan 27 11:38:04 2017 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Fri Jan 27 11:38:04 2017 -0500
----------------------------------------------------------------------
app/controllers/AccountController.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3c945375/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 4b83536..baa8e07 100644
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -185,7 +185,8 @@ class AccountController extends BaseController
//FIXME There is a bug in WSO2 IS which doest not return the admin role for the default admin user.
//FIXME Hence as a workaround we manually add it here.
- if ($username == Config::get('pga_config.wsis')['admin-username'] ){
+ if ($username == Config::get('pga_config.wsis')['admin-username']
+ || $username == Config::get('pga_config.wsis')['admin-username'] . '@' . Config::get('pga_config.wsis')['tenant-domain']){
$userRoles[] = Config::get('pga_config.wsis')['admin-role-name'];
}