Skip to content
Permalink
Browse files
Merge remote-tracking branch 'refs/remotes/sneha/develop' into develop
This closes #67
  • Loading branch information
machristie committed Jul 9, 2017
2 parents 5f30245 + cf2274a commit c56680aab312684da850f9b43ea72474dc059b52
Showing 3 changed files with 4 additions and 3 deletions.
@@ -507,7 +507,7 @@ public function checkRequest(){
$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.";
@@ -179,6 +179,7 @@ public static function update_gateway( $gatewayId, $gatewayData){
$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 @@ public static function update_gateway( $gatewayId, $gatewayData){
$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;
@@ -222,7 +222,7 @@ public static function create_nav_bar()
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' : '') . '">

0 comments on commit c56680a

Please sign in to comment.