airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject airavata-php-gateway git commit: appending the last commit
Date Fri, 27 Jan 2017 16:38:08 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/develop e84cc14fa -> 3c9453752


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/develop
Commit: 3c94537529b0f7f6c6614ec66cc92b5bc7927360
Parents: e84cc14
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Fri Jan 27 11:38:04 2017 -0500
Committer: scnakandala <supun.nakandala@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'];
         }
 


Mime
View raw message