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/09/27 15:30:04 UTC
[1/2] airavata-php-gateway git commit: AIRAVATA-2500 Only display
auto ssh setup results if they exist
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop f78e49e07 -> e472d8e41
AIRAVATA-2500 Only display auto ssh setup results if they exist
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/fcc30bef
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/fcc30bef
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/fcc30bef
Branch: refs/heads/develop
Commit: fcc30befc1a46de32b2cef13db033399f1ad872c
Parents: f78e49e
Author: Marcus Christie <ma...@iu.edu>
Authored: Wed Sep 27 11:18:51 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Wed Sep 27 11:18:51 2017 -0400
----------------------------------------------------------------------
app/controllers/AccountController.php | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/fcc30bef/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 3bf9e0c..cd2643e 100644
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -298,11 +298,19 @@ class AccountController extends BaseController
// Log::debug("auto_provisioned_accounts", array($auto_provisioned_accounts));
if(Session::has("admin") || Session::has("admin-read-only") || Session::has("gateway-provider")){
- return Redirect::to("admin/dashboard". "?status=ok&code=".$accessToken . "&username=".$username
- . "&refresh_code=" . $refreshToken . "&valid_time=" . $validTime)->with("auto_provisioned_accounts", $auto_provisioned_accounts);
+ $response = Redirect::to("admin/dashboard". "?status=ok&code=".$accessToken . "&username=".$username
+ . "&refresh_code=" . $refreshToken . "&valid_time=" . $validTime);
+ if (!empty($auto_provisioned_accounts)) {
+ $response = $response->with("auto_provisioned_accounts", $auto_provisioned_accounts);
+ }
+ return $response;
}else{
- return Redirect::to("account/dashboard". "?status=ok&code=".$accessToken ."&username=".$username
- . "&refresh_code=" . $refreshToken . "&valid_time=" . $validTime)->with("auto_provisioned_accounts", $auto_provisioned_accounts);
+ $response = Redirect::to("account/dashboard". "?status=ok&code=".$accessToken ."&username=".$username
+ . "&refresh_code=" . $refreshToken . "&valid_time=" . $validTime);
+ if (!empty($auto_provisioned_accounts)) {
+ $response = $response->with("auto_provisioned_accounts", $auto_provisioned_accounts);
+ }
+ return $response;
}
}
[2/2] airavata-php-gateway git commit: AIRAVATA-2500 Add closing tag
Posted by ma...@apache.org.
AIRAVATA-2500 Add closing tag
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/e472d8e4
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e472d8e4
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e472d8e4
Branch: refs/heads/develop
Commit: e472d8e41bce3aa0422af6dd795eb4365ad8ad9d
Parents: fcc30be
Author: Marcus Christie <ma...@iu.edu>
Authored: Wed Sep 27 11:27:40 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Wed Sep 27 11:27:40 2017 -0400
----------------------------------------------------------------------
app/views/partials/auto-provisioned-accounts.blade.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e472d8e4/app/views/partials/auto-provisioned-accounts.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/auto-provisioned-accounts.blade.php b/app/views/partials/auto-provisioned-accounts.blade.php
index e10fc32..58a3a29 100644
--- a/app/views/partials/auto-provisioned-accounts.blade.php
+++ b/app/views/partials/auto-provisioned-accounts.blade.php
@@ -49,4 +49,5 @@
</tbody>
</table>
</div>
- </div>
\ No newline at end of file
+ </div>
+</div>
\ No newline at end of file