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/04 16:25:47 UTC
[1/3] airavata-php-gateway git commit: Fix for AIRAVATA-2476
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 8fefd0132 -> 2d8b6d7b2
Fix for AIRAVATA-2476
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/816ae6c4
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/816ae6c4
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/816ae6c4
Branch: refs/heads/develop
Commit: 816ae6c4e39b92e48a40c7f2c72ffdc55f392665
Parents: 26a207a
Author: Sneha Tilak <ti...@Snehas-MacBook-Pro.local>
Authored: Mon Jul 3 16:28:27 2017 -0500
Committer: Sneha Tilak <ti...@Snehas-MacBook-Pro.local>
Committed: Mon Jul 3 16:28:27 2017 -0500
----------------------------------------------------------------------
app/views/admin/manage-gateway.blade.php | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/816ae6c4/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index d619f40..a0df5a6 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -58,7 +58,7 @@
<ul class="nav nav-tabs nav-justified" id="tabs" role="tablist">
<li class="active"><a href="#tab-currentGateway" data-toggle="tab">Gateway - {{ Session::get("gateway_id") }}</a></li>
@if( Session::has('super-admin'))
- <li><a href="#tab-allGateways" data-toggle="tab">Approved Gateways</a></li>
+ <li><a href="#tab-allGateways" data-toggle="tab">Created Gateways</a></li>
<li><a href="#tab-requestedGateways" data-toggle="tab">Gateway Requests</a></li>
@endif
</ul>
@@ -158,9 +158,7 @@
<div class="panel-group super-admin-gateways-view" id="accordion1">
@foreach( $gateways as $indexGP => $gp )
- @if( $gatewayApprovalStatuses[$gp->gatewayApprovalStatus] == "APPROVED" ||
- $gatewayApprovalStatuses[$gp->gatewayApprovalStatus] == "ACTIVE" ||
- $gatewayApprovalStatuses[$gp->gatewayApprovalStatus] == "CREATED")
+ @if( $gatewayApprovalStatuses[$gp->gatewayApprovalStatus] == "CREATED")
@include('partials/gateway-preferences-block', array("gp" => $gp, "accName" => "accordion1"))
[3/3] airavata-php-gateway git commit: Merge remote-tracking branch
'sneha/2476' into develop
Posted by ma...@apache.org.
Merge remote-tracking branch 'sneha/2476' into develop
This closes #60
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/2d8b6d7b
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/2d8b6d7b
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/2d8b6d7b
Branch: refs/heads/develop
Commit: 2d8b6d7b222af29408ee4067f81f42b9107f3730
Parents: 8fefd01 9515879
Author: Marcus Christie <ma...@iu.edu>
Authored: Tue Jul 4 12:21:24 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Tue Jul 4 12:21:24 2017 -0400
----------------------------------------------------------------------
app/views/admin/manage-gateway.blade.php | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2d8b6d7b/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
[2/3] airavata-php-gateway git commit: Displaying deployed gateways
too
Posted by ma...@apache.org.
Displaying deployed gateways too
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/9515879d
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/9515879d
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/9515879d
Branch: refs/heads/develop
Commit: 9515879de26ac6c130ad6eece545ca32d84196d6
Parents: 816ae6c
Author: Sneha Tilak <ti...@Snehas-MacBook-Pro.local>
Authored: Tue Jul 4 11:17:53 2017 -0500
Committer: Sneha Tilak <ti...@Snehas-MacBook-Pro.local>
Committed: Tue Jul 4 11:17:53 2017 -0500
----------------------------------------------------------------------
app/views/admin/manage-gateway.blade.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/9515879d/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index a0df5a6..6867da6 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -158,7 +158,8 @@
<div class="panel-group super-admin-gateways-view" id="accordion1">
@foreach( $gateways as $indexGP => $gp )
- @if( $gatewayApprovalStatuses[$gp->gatewayApprovalStatus] == "CREATED")
+ @if( $gatewayApprovalStatuses[$gp->gatewayApprovalStatus] == "CREATED" ||
+ $gatewayApprovalStatuses[$gp->gatewayApprovalStatus] == "DEPLOYED" )
@include('partials/gateway-preferences-block', array("gp" => $gp, "accName" => "accordion1"))