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 2016/01/27 16:23:07 UTC
[1/2] airavata-php-gateway git commit: fixing user search issue
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 78cc9ab9b -> e675d4d64
fixing user search 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/dddb721f
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/dddb721f
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/dddb721f
Branch: refs/heads/develop
Commit: dddb721f95002cc1f6a66be24b3d6ab4c19c9ce4
Parents: 6c04ff3
Author: scnakandala <su...@gmail.com>
Authored: Wed Jan 27 10:22:13 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Jan 27 10:22:13 2016 -0500
----------------------------------------------------------------------
app/controllers/AccountController.php | 2 +-
app/controllers/AdminController.php | 3 +++
app/controllers/StorageResourceController.php | 1 +
app/libraries/Wsis/Stubs/UserStoreManager.php | 5 +++--
4 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dddb721f/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index dfe7b22..a213870 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -132,7 +132,7 @@ class AccountController extends BaseController
Session::put('oauth-refresh-code',$refreshToken);
Session::put('oauth-expiration-time',$expirationTime);
Session::put("user-profile", $userProfile);
-
+ Session::put('username', "Eroma2015");
if (in_array(Config::get('pga_config.wsis')['admin-role-name'], $userRoles)) {
Session::put("admin", true);
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dddb721f/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index 23096f1..95b974d 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -46,6 +46,9 @@ class AdminController extends BaseController {
else
$users = WSIS::listUsers();
+ if(!isset($users) || empty($users)){
+ $users = array();
+ }
$roles = WSIS::getAllRoles();
Session::put("admin-nav", "manage-users");
return View::make("admin/manage-users", array("users" => $users, "roles" => $roles));
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dddb721f/app/controllers/StorageResourceController.php
----------------------------------------------------------------------
diff --git a/app/controllers/StorageResourceController.php b/app/controllers/StorageResourceController.php
index 0ec4c6e..ca1564d 100644
--- a/app/controllers/StorageResourceController.php
+++ b/app/controllers/StorageResourceController.php
@@ -160,6 +160,7 @@ class StorageresourceController extends BaseController
{
$this->beforeFilter('verifyeditadmin');
$result = SRUtilities::deleteActions(Input::all());
+ var_dump($result);exit;
/*
if (Input::has("jsiId")) {
return Redirect::to("cr/edit?crId=" . Input::get("crId") . "#tab-jobSubmission")
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dddb721f/app/libraries/Wsis/Stubs/UserStoreManager.php
----------------------------------------------------------------------
diff --git a/app/libraries/Wsis/Stubs/UserStoreManager.php b/app/libraries/Wsis/Stubs/UserStoreManager.php
index 706f847..7afda25 100755
--- a/app/libraries/Wsis/Stubs/UserStoreManager.php
+++ b/app/libraries/Wsis/Stubs/UserStoreManager.php
@@ -127,8 +127,9 @@ class UserStoreManager {
$parameters = new ListUsers();
$parameters->filter = "*" . $phrase . "*";
$parameters->maxItemLimit = -1;
-
- return $this->serviceStub->listUsers($parameters)->return;
+ if(isset($this->serviceStub->listUsers($parameters)->return)){
+ return $this->serviceStub->listUsers($parameters)->return;
+ }
}
/**
[2/2] airavata-php-gateway git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Posted by sc...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway 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/e675d4d6
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e675d4d6
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e675d4d6
Branch: refs/heads/develop
Commit: e675d4d6491e68d143452c7d47a81c81eeb0d7e6
Parents: dddb721 78cc9ab
Author: scnakandala <su...@gmail.com>
Authored: Wed Jan 27 10:22:55 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Jan 27 10:22:55 2016 -0500
----------------------------------------------------------------------
app/controllers/AdminController.php | 17 +++++++
app/controllers/StorageResourceController.php | 2 +-
app/libraries/ExperimentUtilities.php | 1 -
app/routes.php | 6 ++-
app/views/admin/manage-experiments.blade.php | 28 +++++------
app/views/partials/experiment-info.blade.php | 6 +--
app/views/project/summary.blade.php | 32 ++++++++++---
app/views/resource/browse.blade.php | 20 +-------
app/views/resource/edit.blade.php | 17 -------
app/views/storage-resource/browse.blade.php | 55 ++++++++++++++++++----
app/views/storage-resource/edit.blade.php | 7 ++-
public/js/script.js | 17 +++++++
public/js/time-conversion.js | 4 +-
13 files changed, 138 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e675d4d6/app/controllers/AdminController.php
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e675d4d6/app/controllers/StorageResourceController.php
----------------------------------------------------------------------