Merge remote-tracking branch 'refs/remotes/sneha/develop' into develop
This closes #67
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index 69ddd91..28eb9a5 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -507,7 +507,7 @@
$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 Gateway request for " . $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.";
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 @@
$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 @@
$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;
diff --git a/app/libraries/CommonUtilities.php b/app/libraries/CommonUtilities.php
index d6c7eae9..238706c 100644
--- a/app/libraries/CommonUtilities.php
+++ b/app/libraries/CommonUtilities.php
@@ -222,7 +222,7 @@
if ( (Session::has("admin") || Session::has("admin-read-only")) && !Session::has("gateway-provider") )
$navbar .= '<li class="' . $active . '"><a href="' . URL::to("/") . '/admin/dashboard"><span class="glyphicon glyphicon-user"></span>Admin Dashboard</a></li>';
else
- $navbar .= '<li class="' . $active . '"><a href="' . URL::to("/") . '/account/dashboard"><span class="glyphicon glyphicon-user"></span>Dashboard</a></li>';
+ $navbar .= '<li class="' . $active . '"><a href="' . URL::to("/") . '/admin/dashboard"><span class="glyphicon glyphicon-user"></span>Dashboard</a></li>';
$navbar .= '<li class="dropdown' . (Session::get("nav-active") == 'user-menu' ? ' active' : '') . '">
