airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [04/10] airavata-php-gateway git commit: Modified view to return duplicate gateway requests
Date Sun, 02 Jul 2017 00:46:58 GMT
Modified view to return duplicate gateway requests


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

Branch: refs/heads/develop
Commit: 75d43f746797e142a6750e577c8dfb8a4d64525c
Parents: fba2720
Author: Sneha Tilak <tilaks@149-160-244-249.dhcp-bl.indiana.edu>
Authored: Fri Jun 30 13:26:41 2017 -0400
Committer: Sneha Tilak <tilaks@149-160-244-249.dhcp-bl.indiana.edu>
Committed: Fri Jun 30 13:26:41 2017 -0400

----------------------------------------------------------------------
 app/controllers/AdminController.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/75d43f74/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index ad7ac78..2d87c2a 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -25,6 +25,9 @@ class AdminController extends BaseController {
             $gatewayOfUser = "";
             Session::put("super-admin", true);
             $gatewaysInfo = CRUtilities::getAllGateways();
+            Log::info("Gateways: ", $gatewaysInfo);
+            Log::info("Username: ", [Session::get("username")]);
+            //$gatewaysInfo = CRUtilities::getAllGateways();
             //var_dump( $gatewaysInfo); exit;
             $requestedGateways = array();
             $gatewayApprovalStatuses = AdminUtilities::get_gateway_approval_statuses();
@@ -36,8 +39,8 @@ class AdminController extends BaseController {
                     Session::put("new-gateway-provider", true);
                     Session::put("existing-gateway-provider", true);
 
-                    $requestedGateways[ $gateway->gatewayId]["gatewayInfo"] = $gateway;
-                    $requestedGateways[ $gateway->gatewayId]["approvalStatus"] = $gatewayApprovalStatuses[
$gateway->gatewayApprovalStatus];
+                    $requestedGateways[ $gateway->airavataInternalGatewayId]["gatewayInfo"]
= $gateway;
+                    $requestedGateways[ $gateway->airavataInternalGatewayId]["approvalStatus"]
= $gatewayApprovalStatuses[ $gateway->gatewayApprovalStatus];
                     //seeing if admin wants to start managing one of the gateways
 		            if( Input::has("gatewayId")){
 		            	if( Input::get("gatewayId") == $gateway->gatewayId)


Mime
View raw message