airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [1/4] airavata-php-gateway git commit: differentiating the scigap portal through a configuration
Date Thu, 07 Jan 2016 17:38:05 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/master b73806af7 -> 55cbd9e79


differentiating the scigap portal through a configuration


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

Branch: refs/heads/master
Commit: 062aef9c425997a6b5259e80e3452647ce7f9074
Parents: 33bd2a7
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Thu Jan 7 12:24:40 2016 -0500
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Thu Jan 7 12:24:40 2016 -0500

----------------------------------------------------------------------
 app/config/pga_config.php.template    | 4 ++++
 app/controllers/AccountController.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/062aef9c/app/config/pga_config.php.template
----------------------------------------------------------------------
diff --git a/app/config/pga_config.php.template b/app/config/pga_config.php.template
index 041004d..344813b 100644
--- a/app/config/pga_config.php.template
+++ b/app/config/pga_config.php.template
@@ -170,6 +170,10 @@ return array(
      * *****************************************************************
      */
     'portal' => [
+        /**
+         * Whether this portal is the SciGaP admin portal
+         */
+        'scigap-admin-portal' => false,
 
         /**
          * Set the name of theme in use here

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/062aef9c/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 3f1bd6b..e1975cd 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -144,7 +144,7 @@ class AccountController extends BaseController
             }
 
             //only for super admin
-            if(  Config::get('pga_config.wsis')['tenant-domain'] == ""){
+            if(  Config::get('pga_config.portal')['scigap-admin-portal'] == true){
                 Session::put("scigap_admin", true);
             }
 


Mime
View raw message