airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [33/50] [abbrv] airavata-php-gateway git commit: Removing the scigap word in user roles
Date Thu, 14 Jan 2016 15:43:29 GMT
Removing the scigap word in user roles


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

Branch: refs/heads/develop
Commit: 5c1a7739ca3735828bb66e617e973ea338651589
Parents: 48a35a3
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Thu Jan 7 16:54:23 2016 -0500
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Thu Jan 7 16:54:23 2016 -0500

----------------------------------------------------------------------
 app/config/pga_config.php.template           |  2 +-
 app/controllers/AccountController.php        |  4 ++--
 app/controllers/AdminController.php          |  2 +-
 app/libraries/CRUtilities.php                |  2 +-
 app/libraries/SRUtilities.php                |  2 +-
 app/views/admin/manage-gateway.blade.php     |  2 +-
 app/views/partials/dashboard-block.blade.php |  4 ++--
 app/views/resource/browse.blade.php          | 10 +++++-----
 app/views/resource/edit.blade.php            |  2 +-
 app/views/storage-resource/browse.blade.php  |  8 ++++----
 10 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/config/pga_config.php.template
----------------------------------------------------------------------
diff --git a/app/config/pga_config.php.template b/app/config/pga_config.php.template
index fa0a7d5..2a11842 100644
--- a/app/config/pga_config.php.template
+++ b/app/config/pga_config.php.template
@@ -173,7 +173,7 @@ return array(
         /**
          * Whether this portal is the SciGaP admin portal
          */
-        'scigap-admin-portal' => false,
+        'super-admin-portal' => false,
 
         /**
          * Set the name of theme in use here

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index e1975cd..dfe7b22 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -144,8 +144,8 @@ class AccountController extends BaseController
             }
 
             //only for super admin
-            if(  Config::get('pga_config.portal')['scigap-admin-portal'] == true){
-                Session::put("scigap_admin", true);
+            if(  Config::get('pga_config.portal')['super-admin-portal'] == true){
+                Session::put("super-admin", true);
             }
 
             CommonUtilities::store_id_in_session($username);

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index 5b85235..2b45e4b 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -52,7 +52,7 @@ class AdminController extends BaseController {
 
     public function gatewayView(){
     	//only for super admin
-		//Session::put("scigap_admin", true);
+		//Session::put("super-admin", true);
 		$crData = CRUtilities::getEditCRData();
 		$gateways = CRUtilities::getAllGatewayProfilesData();
 		$tokens = AdminUtilities::get_all_ssh_tokens();

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/libraries/CRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CRUtilities.php b/app/libraries/CRUtilities.php
index 0054d5a..669004d 100755
--- a/app/libraries/CRUtilities.php
+++ b/app/libraries/CRUtilities.php
@@ -442,7 +442,7 @@ class CRUtilities
     public static function getAllGatewayProfilesData()
     {
 
-        if (Session::has("scigap_admin"))
+        if (Session::has("super-admin"))
             $gateways = Airavata::getAllGateways(Session::get('authz-token'));
         else {
             $gateways[0] = Airavata::getGateway(Session::get('authz-token'), Session::get("gateway_id"));

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/libraries/SRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/SRUtilities.php b/app/libraries/SRUtilities.php
index a380026..78669c0 100644
--- a/app/libraries/SRUtilities.php
+++ b/app/libraries/SRUtilities.php
@@ -242,7 +242,7 @@ class SRUtilities
     public static function getAllGatewayProfilesData()
     {
 
-        if (Session::has("scigap_admin"))
+        if (Session::has("super-admin"))
             $gateways = Airavata::getAllGateways(Session::get('authz-token'));
         else {
             $gateways[0] = Airavata::getGateway(Session::get('authz-token'), Session::get("gateway_id"));

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index 222f2d5..6c47742 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -30,7 +30,7 @@
                 <div class="col-md-6">
                     <h3>Gateway Preferences</h3>
                 </div>
-                @if( Session::has("scigap_admin"))
+                @if( Session::has("super-admin"))
                 <div class="col-md-6" style="margin-top:2%">
                     <input type="text" class="col-md-12 filterinput" placeholder="Search
by Gateway Name"/>
                 </div>

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/views/partials/dashboard-block.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/dashboard-block.blade.php b/app/views/partials/dashboard-block.blade.php
index cf0205f..12b63d9 100644
--- a/app/views/partials/dashboard-block.blade.php
+++ b/app/views/partials/dashboard-block.blade.php
@@ -20,7 +20,7 @@
         <li>
             <a><span class="glyphicon glyphicon-briefcase"></span>&nbsp;
Compute Resources</a>
             <ul>
-                @if(Session::has("scigap_admin"))
+                @if(Session::has("super-admin"))
                 <li
                 @if( Session::has("admin-nav") && Session::get("admin-nav") == "cr-create")
class="active" @endif>
                     <a class="dashboard-link" href="{{ URL::to('/')}}/cr/create"><i
class="fa fa-fw fa-table"></i>Register</a>
@@ -39,7 +39,7 @@
         <li>
             <a><span class="glyphicon glyphicon-folder-open"></span>&nbsp;
Storage Resources</a>
             <ul>
-                @if(Session::has("scigap_admin"))
+                @if(Session::has("super-admin"))
                 <li
                 @if( Session::has("admin-nav") && Session::get("admin-nav") == "sr-create")
class="active" @endif>
                     <a class="dashboard-link" href="{{ URL::to('/')}}/sr/create"><i
class="fa fa-fw fa-table"></i>Register</a>

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/views/resource/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/browse.blade.php b/app/views/resource/browse.blade.php
index 2f5095f..550cf46 100644
--- a/app/views/resource/browse.blade.php
+++ b/app/views/resource/browse.blade.php
@@ -51,12 +51,12 @@
                         <th>Id</th>
                         @if(Session::has("admin"))
                         <th>Enabled</th>
-                        @if(Session::has("scigap_admin"))
+                        @if(Session::has("super-admin"))
                             <th>Edit</th>
                         @endif
                         @endif
                         <th>View</th>
-                        @if(Session::has("scigap_admin"))
+                        @if(Session::has("super-admin"))
                             <th>Delete</th>
                         @endif
                     </tr>
@@ -75,7 +75,7 @@
                             @if(!$enabled)
                             <div class="checkbox">
                                 <input class="resource-status" resourceId="{{$crId}}"
type="checkbox"
-                                @if(!Session::has("scigap_admin"))
+                                @if(!Session::has("super-admin"))
                                    disabled="disabled"
                                 @endif
                                 >
@@ -83,7 +83,7 @@
                             @else
                             <div class="checkbox">
                                 <input class="resource-status" type="checkbox" resourceId="{{$crId}}"
checked
-                                   @if(!Session::has("scigap_admin"))
+                                   @if(!Session::has("super-admin"))
                                        disabled="disabled"
                                    @endif
                                    >
@@ -95,7 +95,7 @@
                             </a>
                         </td>
                         @endif
-                        @if(Session::has("scigap_admin"))
+                        @if(Session::has("super-admin"))
                             <td>
                                 <a href="{{URL::to('/')}}/cr/edit?crId={{ $crId }}" title="Edit">
                                     <span class="glyphicon glyphicon-pencil"></span>

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/views/resource/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/edit.blade.php b/app/views/resource/edit.blade.php
index 459bbf3..709cf86 100644
--- a/app/views/resource/edit.blade.php
+++ b/app/views/resource/edit.blade.php
@@ -841,7 +841,7 @@
     })
 </script>
 
-@if(! Session::has('scigap_admin'))
+@if(! Session::has('super-admin'))
     <script>
     function disableInputs( elem){
         elem.find("input").each( function( i,e){

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/views/storage-resource/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/storage-resource/browse.blade.php b/app/views/storage-resource/browse.blade.php
index 5edde1c..f3b534f 100644
--- a/app/views/storage-resource/browse.blade.php
+++ b/app/views/storage-resource/browse.blade.php
@@ -48,11 +48,11 @@
                         <tr>
                             <th>Id</th>
                             <th>Hostname</th>
-                            @if(Session::has("scigap_admin"))
+                            @if(Session::has("super-admin"))
                             <th>Edit</th>
                             @endif
                             <th>View</th>
-                            @if(Session::has("scigap_admin"))
+                            @if(Session::has("super-admin"))
                             <th>Delete</th>
                             @endif
                         </tr>
@@ -65,7 +65,7 @@
                         <tr id="srDetails">
                             <td>{{ $srId }}</td>
                             <td>{{ $hostName }}</td>
-                            @if(Session::has("scigap_admin"))
+                            @if(Session::has("super-admin"))
                             <td><a href="{{URL::to('/')}}/sr/edit?srId={{ $srId
}}" title="Edit">
                                     <span class="glyphicon glyphicon-pencil"></span>
                                 </a>
@@ -76,7 +76,7 @@
                                 <span class="glyphicon glyphicon-list"></span>
                                 </a>
                             </td>
-                            @if(Session::has("scigap_admin"))
+                            @if(Session::has("super-admin"))
                             <td>
                                 <a href="#" title="Delete">
                                     <span class="glyphicon glyphicon-trash del-sr" data-toggle="modal"


Mime
View raw message