You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/07/13 20:06:21 UTC
airavata-php-gateway git commit: fixing CR view issue
Repository: airavata-php-gateway
Updated Branches:
refs/heads/master 0a2ddc276 -> 190771810
fixing CR view issue
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/19077181
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/19077181
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/19077181
Branch: refs/heads/master
Commit: 19077181042b82838c0919b2867890e414dad65a
Parents: 0a2ddc2
Author: Supun Nakandala <sc...@apache.org>
Authored: Mon Jul 13 23:35:58 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Mon Jul 13 23:35:58 2015 +0530
----------------------------------------------------------------------
app/controllers/AdminController.php | 2 +-
app/controllers/ComputeResource.php | 2 +-
app/controllers/ResourceController.php | 2 +-
app/libraries/CRUtilities.php | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/19077181/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index 06b86de..641f3a5 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -78,7 +78,7 @@ class AdminController extends BaseController {
}
public function resourcesView(){
- $data = CRUtilities::getBrowseCRData();
+ $data = CRUtilities::getBrowseCRData(false);
$allCRs = $data["crObjects"];
return View::make("admin/manage-resources", array("resources" => $allCRs) );
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/19077181/app/controllers/ComputeResource.php
----------------------------------------------------------------------
diff --git a/app/controllers/ComputeResource.php b/app/controllers/ComputeResource.php
index 40319c4..c21bddb 100755
--- a/app/controllers/ComputeResource.php
+++ b/app/controllers/ComputeResource.php
@@ -235,7 +235,7 @@ class ComputeResource extends BaseController
public function browseView()
{
- $data = CRUtilities::getBrowseCRData();
+ $data = CRUtilities::getBrowseCRData(true);
$allCRs = $data["crObjects"];
$appDeployments = $data["appDeployments"];
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/19077181/app/controllers/ResourceController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ResourceController.php b/app/controllers/ResourceController.php
index 41eddcb..91530a2 100755
--- a/app/controllers/ResourceController.php
+++ b/app/controllers/ResourceController.php
@@ -188,7 +188,7 @@ class ResourceController extends BaseController
public function browseView()
{
- $data = CRUtilities::getBrowseCRData();
+ $data = CRUtilities::getBrowseCRData(true);
$allCRs = $data["crObjects"];
$appDeployments = $data["appDeployments"];
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/19077181/app/libraries/CRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CRUtilities.php b/app/libraries/CRUtilities.php
index fdd0390..8d097b5 100755
--- a/app/libraries/CRUtilities.php
+++ b/app/libraries/CRUtilities.php
@@ -298,11 +298,11 @@ class CRUtilities
}
- public static function getBrowseCRData()
+ public static function getBrowseCRData($onlyNames)
{
$appDeployments = Airavata::getAllApplicationDeployments(Session::get("gateway_id"));
- return array('crObjects' => CRUtilities::getAllCRObjects(true),
+ return array('crObjects' => CRUtilities::getAllCRObjects($onlyNames),
'appDeployments' => $appDeployments
);
}