airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [44/50] [abbrv] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Date Tue, 09 Feb 2016 15:56:12 GMT
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into
develop

# Conflicts:
#	app/views/account/dashboard.blade.php


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

Branch: refs/heads/master
Commit: be7e471721748be655923c25c27ffaca0b67dc4b
Parents: 87a2f23 9c8eb1f
Author: Nipurn Doshi <nipunhere@gmail.com>
Authored: Wed Feb 3 11:17:14 2016 -0500
Committer: Nipurn Doshi <nipunhere@gmail.com>
Committed: Wed Feb 3 11:17:14 2016 -0500

----------------------------------------------------------------------
 app/controllers/AccountController.php        |    2 +-
 app/controllers/DataCatController.php        |   23 +
 app/filters.php                              |    2 +-
 app/libraries/Wsis/Wsis.php                  |    5 +-
 app/routes.php                               |    6 +
 app/views/account/dashboard.blade.php        |    9 +-
 app/views/admin/manage-credentials.blade.php |    4 +
 app/views/datacat/select.blade.php           |   82 +
 app/views/datacat/summary.blade.php          |  451 ++++++
 public/js/datacat/GLmol.js                   | 1708 +++++++++++++++++++++
 public/js/datacat/Three.js                   |  382 +++++
 public/js/datacat/jquery-1.7.min.js          |    4 +
 12 files changed, 2669 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/be7e4717/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --cc app/controllers/AccountController.php
index 4a6c1bf,a8ac349..f0131eb
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@@ -146,9 -144,10 +146,9 @@@ class AccountController extends BaseCon
              }
  
              //only for super admin
-             if(  Config::get('pga_config.portal')['super-admin-portal'] == true){
+             if(  Config::get('pga_config.portal')['super-admin-portal'] == true &&
Session::has("admin")){
                  Session::put("super-admin", true);
              }
 -
              CommonUtilities::store_id_in_session($username);
              Session::put("gateway_id", Config::get('pga_config.airavata')['gateway-id']);
  

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/be7e4717/app/views/account/dashboard.blade.php
----------------------------------------------------------------------
diff --cc app/views/account/dashboard.blade.php
index 530ebe1,c210d2c..9fc4b7a
--- a/app/views/account/dashboard.blade.php
+++ b/app/views/account/dashboard.blade.php
@@@ -65,7 -65,7 +65,8 @@@
                  @endif
              </div>
  
 -            @if( Session::has('admin') || Session::has('admin-read-only'))
 +            @if( Session::has('admin') || Session::has('admin-read-only') )
++
              <div class="row well">
  
                  <h3>Manage Users Access</h3>


Mime
View raw message