Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9ABB7200CDC for ; Sun, 2 Jul 2017 02:47:00 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 999C2160BEA; Sun, 2 Jul 2017 00:47:00 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6E7A6160C05 for ; Sun, 2 Jul 2017 02:46:59 +0200 (CEST) Received: (qmail 76538 invoked by uid 500); 2 Jul 2017 00:46:58 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 76138 invoked by uid 99); 2 Jul 2017 00:46:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Jul 2017 00:46:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 885DFF3216; Sun, 2 Jul 2017 00:46:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: machristie@apache.org To: commits@airavata.apache.org Date: Sun, 02 Jul 2017 00:46:58 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/10] airavata-php-gateway git commit: Modified view to return duplicate gateway requests archived-at: Sun, 02 Jul 2017 00:47:00 -0000 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 Authored: Fri Jun 30 13:26:41 2017 -0400 Committer: Sneha Tilak 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)