You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2016/10/28 14:17:38 UTC
[4/7] airavata-php-gateway git commit: Merge branch 'develop'
Merge branch '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/62e2abd1
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/62e2abd1
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/62e2abd1
Branch: refs/heads/develop
Commit: 62e2abd17d06e24d791ab13fd2c39232d159eece
Parents: f9b2a58 9c1af93
Author: Suresh Marru <sm...@apache.org>
Authored: Thu Jul 14 16:15:29 2016 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Thu Jul 14 16:15:29 2016 -0400
----------------------------------------------------------------------
app/config/pga_config_default_template.php | 243 -------------------
app/controllers/AccountController.php | 22 +-
app/controllers/AdminController.php | 69 +++++-
app/controllers/GatewayController.php | 40 +++
app/libraries/AdminUtilities.php | 40 +++
app/libraries/Airavata/API/Airavata.php | 31 ++-
.../Airavata/Model/Workspace/Types.php | 115 +++++++++
app/libraries/CRUtilities.php | 1 -
app/libraries/ProjectUtilities.php | 1 +
app/routes.php | 4 +
app/views/account/dashboard.blade.php | 108 +++++----
app/views/admin/manage-gateway.blade.php | 36 +++
app/views/home.blade.php | 4 +-
13 files changed, 404 insertions(+), 310 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/62e2abd1/app/libraries/ProjectUtilities.php
----------------------------------------------------------------------
diff --cc app/libraries/ProjectUtilities.php
index 1ac6502,23c4f86..16fefc8
--- a/app/libraries/ProjectUtilities.php
+++ b/app/libraries/ProjectUtilities.php
@@@ -131,8 -131,8 +131,9 @@@ class ProjectUtilitie
$project = new Project();
$project->owner = $username;
$project->name = "Default Project";
+ $project->gatewayId = Config::get('pga_config.airavata')['gateway-id'];
$project->description = "This is the default project for user " . $project->owner;
+ $project->gatewayId = Config::get('pga_config.airavata')['gateway-id'];
$projectId = null;