airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [25/50] airavata-php-gateway git commit: Fix for 2022 and 2474
Date Thu, 03 Aug 2017 17:03:16 GMT
Fix for 2022 and 2474


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

Branch: refs/heads/master
Commit: 6de38b9729267dfb1622332221b3a6c8d9eddd47
Parents: 77914bc
Author: Sneha Tilak <tilaks@149-160-244-249.dhcp-bl.indiana.edu>
Authored: Fri Jul 7 12:26:17 2017 -0400
Committer: Sneha Tilak <tilaks@149-160-244-249.dhcp-bl.indiana.edu>
Committed: Fri Jul 7 12:26:17 2017 -0400

----------------------------------------------------------------------
 app/controllers/AdminController.php | 2 +-
 app/libraries/AdminUtilities.php    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6de38b97/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index 4bf52bb..bf9073d 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -504,7 +504,7 @@ class AdminController extends BaseController {
                 $email = Config::get('pga_config.portal')['admin-emails'];
                 $user_profile = Keycloak::getUserProfile($username);
                 EmailUtilities::gatewayRequestMail($user_profile["firstname"], $user_profile["lastname"],
$email, $inputs["gateway-name"]);
-                Session::put("message", "Your request for Gateway " . $inputs["gateway-name"]
. " has been created.");
+                Session::put("message", "Your request for Gateway " . $inputs["gateway-name"]
. " has been created. Your new Gateway request is yet to be approved. You will be notified
of the approval status via email notification.");
             }
             else{
                 $error = "A Gateway already exists with the same GatewayId, Name or URL!
Please make a new request.";

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6de38b97/app/libraries/AdminUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/AdminUtilities.php b/app/libraries/AdminUtilities.php
index 7d6f33e..7f17408 100644
--- a/app/libraries/AdminUtilities.php
+++ b/app/libraries/AdminUtilities.php
@@ -179,6 +179,7 @@ class AdminUtilities
             $gateway->gatewayURL = $gatewayData["gatewayURL"];
             $gateway->gatewayAdminFirstName = $gatewayData["gatewayAdminFirstName"];
             $gateway->gatewayAdminLastName = $gatewayData["gatewayAdminLastName"];
+            $gateway->gatewayAdminEmail = $gatewayData["gatewayAdminEmail"];
             $gateway->identityServerUserName = $gatewayData["identityServerUserName"];
             $gateway->reviewProposalDescription = $gatewayData["reviewProposalDescription"];
             $gateway->gatewayPublicAbstract = $gatewayData["gatewayPublicAbstract"];
@@ -192,8 +193,8 @@ class AdminUtilities
             $gateway->gatewayURL = $gatewayData["gatewayURL"];
             $gateway->gatewayAdminFirstName = $gatewayData["gatewayAdminFirstName"];
             $gateway->gatewayAdminLastName = $gatewayData["gatewayAdminLastName"];
-            $gateway->identityServerUserName = $gatewayData["identityServerUserName"];
             $gateway->gatewayAdminEmail = $gatewayData["gatewayAdminEmail"];
+            $gateway->identityServerUserName = $gatewayData["identityServerUserName"];
             $gateway->reviewProposalDescription = $gatewayData["reviewProposalDescription"];
             $gateway->gatewayPublicAbstract = $gatewayData["gatewayPublicAbstract"];
             $gateway->gatewayApprovalStatus = GatewayApprovalStatus::APPROVED;


Mime
View raw message