You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by nd...@apache.org on 2016/10/13 19:50:57 UTC
[2/2] airavata-php-gateway git commit: Changes added requested in
AIRAVATA-2154
Changes added requested in AIRAVATA-2154
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/12827c15
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/12827c15
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/12827c15
Branch: refs/heads/develop
Commit: 12827c150573fff948f6521a178fb515495af9ef
Parents: cd91176
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Thu Oct 13 12:50:34 2016 -0700
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Thu Oct 13 12:50:34 2016 -0700
----------------------------------------------------------------------
app/controllers/AdminController.php | 4 +++-
app/libraries/CRUtilities.php | 2 +-
app/views/account/dashboard.blade.php | 8 +++++++-
3 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/12827c15/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index b66b5a4..5e19f20 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -13,6 +13,8 @@ class AdminController extends BaseController {
$data = array();
$userProfile = Session::get("user-profile");
Session::forget("new-gateway-provider");
+
+ //check for gateway provider users
if( in_array( "gateway-provider", $userProfile["roles"]) ) {
$gatewayOfUser = "";
Session::put("super-admin", true);
@@ -52,7 +54,7 @@ class AdminController extends BaseController {
Session::put("new-gateway-provider", true);
}
}
- //var_dump( $userInfo); exit;
+
return View::make("account/dashboard", $data);
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/12827c15/app/libraries/CRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CRUtilities.php b/app/libraries/CRUtilities.php
index 6f23d0b..fad1ad2 100755
--- a/app/libraries/CRUtilities.php
+++ b/app/libraries/CRUtilities.php
@@ -508,7 +508,7 @@ class CRUtilities
if (Session::has("super-admin")){
$gateways = Airavata::getAllGateways(Session::get('authz-token'));
//sort with creation time
- usort($gateways, CommonUtilities::arrSortObjsByKey('requestCreationTime', 'DESC'));
+ usort($gateways, CommonUtilities::arrSortObjsByKey('requestCreationTime', 'ASC'));
}
else {
$gateways[0] = Airavata::getGateway(Session::get('authz-token'), Session::get("gateway_id"));
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/12827c15/app/views/account/dashboard.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/dashboard.blade.php b/app/views/account/dashboard.blade.php
index 514a7be..b701ca3 100644
--- a/app/views/account/dashboard.blade.php
+++ b/app/views/account/dashboard.blade.php
@@ -28,8 +28,11 @@
<tr class="text-center">
<th>Gateway Name</th>
<th>Creation Time</th>
+ <th>Gateway URL</th>
+ <th>Project Details</th>
+ <th>Project Abstract</th>
<th>Gateway Request Status</th>
- <th>Actions</th>
+ <th>Actions</th>
<th>Comments</th>
</tr>
</thead>
@@ -47,6 +50,9 @@
intval( strtotime( $addOrSubtract . " " . Session::get("user_timezone") . " hours", $gateway["gatewayInfo"]->requestCreationTime/1000) ) );
?>
<td>{{ $creationTime}}</td>
+ <td>{{ $gateway["gatewayInfo"]->gatewayURL }}</td>
+ <td style="max-width: 400px; word-wrap: break-word;">{{ $gateway["gatewayInfo"]->reviewProposalDescription }}</td>
+ <td>{{ $gateway["gatewayInfo"]->gatewayPublicAbstract }}</td>
<td>{{ $gateway["approvalStatus"] }}</td>
<td>
@if( $gateway["approvalStatus"] == "APPROVED")