Repository: airavata-php-gateway Updated Branches: refs/heads/develop dc6849f52 -> b6c715d67
Fix for AIRAVATA-2475 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/72e8113f Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/72e8113f Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/72e8113f Branch: refs/heads/develop Commit: 72e8113fc42db4339a044a51322db566fdd6dd04 Parents: 26a207a Author: Sneha Tilak <[email protected]> Authored: Mon Jul 3 16:13:29 2017 -0500 Committer: Sneha Tilak <[email protected]> Committed: Mon Jul 3 16:13:29 2017 -0500 ---------------------------------------------------------------------- app/libraries/AdminUtilities.php | 11 +++++++++++ 1 file changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/72e8113f/app/libraries/AdminUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/AdminUtilities.php b/app/libraries/AdminUtilities.php index dc107cf..0e8950f 100644 --- a/app/libraries/AdminUtilities.php +++ b/app/libraries/AdminUtilities.php @@ -144,6 +144,10 @@ class AdminUtilities } if( isset($gatewayData["createTenant"])) { $gatewayData["declinedReason"] = " "; + if ($gateway->identityServerPasswordToken == null) + { + Session::put("errorMessages", "Error: Please ask the Gateway Provider to submit a password."); + } foreach ($gatewayData as $data) { if ($data == null) { return -1; @@ -153,6 +157,13 @@ class AdminUtilities $gateway->gatewayApprovalStatus = GatewayApprovalStatus::CREATED; } elseif( isset( $gatewayData["approveRequest"])){ + $gateway->emailAddress = $gatewayData["emailAddress"]; + $gateway->gatewayURL = $gatewayData["gatewayURL"]; + $gateway->gatewayAdminFirstName = $gatewayData["gatewayAdminFirstName"]; + $gateway->gatewayAdminLastName = $gatewayData["gatewayAdminLastName"]; + $gateway->identityServerUserName = $gatewayData["identityServerUserName"]; + $gateway->reviewProposalDescription = $gatewayData["reviewProposalDescription"]; + $gateway->gatewayPublicAbstract = $gatewayData["gatewayPublicAbstract"]; $gateway->gatewayApprovalStatus = GatewayApprovalStatus::APPROVED; } elseif( isset( $gatewayData["denyRequest"])){
