You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/07/09 06:22:50 UTC
[1/5] airavata-php-gateway git commit: Fix for 2022 and 2474
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 5f3024574 -> c56680aab
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/develop
Commit: 6de38b9729267dfb1622332221b3a6c8d9eddd47
Parents: 77914bc
Author: Sneha Tilak <ti...@149-160-244-249.dhcp-bl.indiana.edu>
Authored: Fri Jul 7 12:26:17 2017 -0400
Committer: Sneha Tilak <ti...@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;
[4/5] airavata-php-gateway git commit: Merge remote-tracking branch
'upstream/develop' into develop
Posted by ma...@apache.org.
Merge remote-tracking branch 'upstream/develop' into develop
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/cf2274a7
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/cf2274a7
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/cf2274a7
Branch: refs/heads/develop
Commit: cf2274a7a4dfe629ba1d75d4fc91a040ca521002
Parents: 315a890 5f30245
Author: Sneha Tilak <ti...@Snehas-MacBook-Pro.local>
Authored: Sun Jul 9 02:06:06 2017 -0400
Committer: Sneha Tilak <ti...@Snehas-MacBook-Pro.local>
Committed: Sun Jul 9 02:06:06 2017 -0400
----------------------------------------------------------------------
app/controllers/AdminController.php | 3 +++
app/libraries/CommonUtilities.php | 2 +-
app/views/admin/manage-users.blade.php | 9 +++++++++
app/views/home.blade.php | 4 ++--
4 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cf2274a7/app/controllers/AdminController.php
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cf2274a7/app/libraries/CommonUtilities.php
----------------------------------------------------------------------
[2/5] airavata-php-gateway git commit: Fix for 2022 and 2484
Posted by ma...@apache.org.
Fix for 2022 and 2484
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/e58ab4e1
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e58ab4e1
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e58ab4e1
Branch: refs/heads/develop
Commit: e58ab4e13713844254e1adcd13140b1992fca4ce
Parents: 6de38b9
Author: Sneha Tilak <ti...@149-160-244-249.dhcp-bl.indiana.edu>
Authored: Fri Jul 7 14:03:53 2017 -0400
Committer: Sneha Tilak <ti...@149-160-244-249.dhcp-bl.indiana.edu>
Committed: Fri Jul 7 14:03:53 2017 -0400
----------------------------------------------------------------------
app/controllers/AdminController.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e58ab4e1/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index bf9073d..bb9ae3a 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. Your new Gateway request is yet to be approved. You will be notified of the approval status via email notification.");
+ 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.";
[5/5] airavata-php-gateway git commit: Merge remote-tracking branch
'refs/remotes/sneha/develop' into develop
Posted by ma...@apache.org.
Merge remote-tracking branch 'refs/remotes/sneha/develop' into develop
This closes #67
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/c56680aa
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/c56680aa
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/c56680aa
Branch: refs/heads/develop
Commit: c56680aab312684da850f9b43ea72474dc059b52
Parents: 5f30245 cf2274a
Author: Marcus Christie <ma...@iu.edu>
Authored: Sun Jul 9 01:22:32 2017 -0500
Committer: Marcus Christie <ma...@iu.edu>
Committed: Sun Jul 9 01:22:32 2017 -0500
----------------------------------------------------------------------
app/controllers/AdminController.php | 2 +-
app/libraries/AdminUtilities.php | 3 ++-
app/libraries/CommonUtilities.php | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/5] airavata-php-gateway git commit: Changed route when provider
redirects to Dashboard
Posted by ma...@apache.org.
Changed route when provider redirects to Dashboard
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/315a8907
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/315a8907
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/315a8907
Branch: refs/heads/develop
Commit: 315a890748a5955f7d185f15eae0b6269a2ebe8b
Parents: e58ab4e
Author: Sneha Tilak <ti...@Snehas-MacBook-Pro.local>
Authored: Sun Jul 9 02:05:08 2017 -0400
Committer: Sneha Tilak <ti...@Snehas-MacBook-Pro.local>
Committed: Sun Jul 9 02:05:08 2017 -0400
----------------------------------------------------------------------
app/libraries/CommonUtilities.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/315a8907/app/libraries/CommonUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CommonUtilities.php b/app/libraries/CommonUtilities.php
index d8eae6c..0d1aca2 100644
--- a/app/libraries/CommonUtilities.php
+++ b/app/libraries/CommonUtilities.php
@@ -222,7 +222,7 @@ class CommonUtilities
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' : '') . '">