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:35 UTC
[1/7] airavata-php-gateway git commit: setting gatewayId in project
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop cd084fe04 -> 31a70432b
setting gatewayId in project
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/f78db58e
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f78db58e
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f78db58e
Branch: refs/heads/develop
Commit: f78db58ef4ea06c4320e51c3dfb17a485d2755bd
Parents: 5a0f06d
Author: scnakandala <su...@gmail.com>
Authored: Fri Jul 8 17:40:50 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Jul 8 17:40:50 2016 -0400
----------------------------------------------------------------------
app/libraries/ProjectUtilities.php | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f78db58e/app/libraries/ProjectUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ProjectUtilities.php b/app/libraries/ProjectUtilities.php
index 6a8a242..1ac6502 100644
--- a/app/libraries/ProjectUtilities.php
+++ b/app/libraries/ProjectUtilities.php
@@ -131,6 +131,7 @@ class ProjectUtilities
$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;
[4/7] airavata-php-gateway git commit: Merge branch 'develop'
Posted by sm...@apache.org.
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;
[6/7] airavata-php-gateway git commit: Merging PR26 into PR27
Posted by sm...@apache.org.
Merging PR26 into PR27
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/f4cd14c3
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f4cd14c3
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f4cd14c3
Branch: refs/heads/develop
Commit: f4cd14c3fb33296ec7de2eedbcb41bafcd93cca8
Parents: d8c6e81 cd084fe
Author: Suresh Marru <sm...@apache.org>
Authored: Fri Oct 28 10:13:14 2016 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Fri Oct 28 10:13:14 2016 -0400
----------------------------------------------------------------------
app/libraries/AppUtilities.php | 17 +++++++++++++++++
app/libraries/ExperimentUtilities.php | 30 +++++++++++++++---------------
2 files changed, 32 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
[3/7] airavata-php-gateway git commit: merge
Posted by sm...@apache.org.
merge
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/f9b2a585
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f9b2a585
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f9b2a585
Branch: refs/heads/develop
Commit: f9b2a585f12d1d4f21b6a57065e619d30c0e9ae9
Parents: e13a01a 1496ebe
Author: scnakandala <su...@gmail.com>
Authored: Tue Jul 12 13:51:28 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Jul 12 13:51:28 2016 -0400
----------------------------------------------------------------------
app/controllers/AccountController.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/7] airavata-php-gateway git commit: merging seagrid
Posted by sm...@apache.org.
merging seagrid
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/e13a01a0
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e13a01a0
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e13a01a0
Branch: refs/heads/develop
Commit: e13a01a06d281a0f55094f5589733e99427229de
Parents: f78db58 3d591e2
Author: scnakandala <su...@gmail.com>
Authored: Mon Jul 11 14:55:04 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jul 11 14:55:04 2016 -0400
----------------------------------------------------------------------
app/config/pga_config_default_template.php | 243 +
app/controllers/AccountController.php | 32 +-
app/controllers/AdminController.php | 25 +-
app/controllers/ComputeResourceController.php | 4 +
app/libraries/Airavata/API/Airavata.php | 11419 ++++++++---------
app/libraries/Airavata/Model/User/Types.php | 109 +-
.../Airavata/Model/Workspace/Types.php | 339 +-
app/libraries/CRUtilities.php | 12 +
app/libraries/CommonUtilities.php | 2 +
app/views/account/dashboard.blade.php | 72 +-
app/views/admin/manage-gateway.blade.php | 43 +-
app/views/home.blade.php | 2 +-
app/views/layout/basic.blade.php | 16 +-
app/views/partials/add-gateway-block.blade.php | 40 +
14 files changed, 5729 insertions(+), 6629 deletions(-)
----------------------------------------------------------------------
[5/7] airavata-php-gateway git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Posted by sm...@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/d8c6e814
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d8c6e814
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d8c6e814
Branch: refs/heads/develop
Commit: d8c6e814f3764b125a05003a19f8b796d4929d8a
Parents: 62e2abd 26ed2cf
Author: Suresh Marru <sm...@apache.org>
Authored: Fri Oct 28 10:11:36 2016 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Fri Oct 28 10:11:36 2016 -0400
----------------------------------------------------------------------
app/config/pga_config.php.template | 17 +-
app/controllers/AccountController.php | 132 +-
app/controllers/AdminController.php | 89 +-
app/controllers/ExperimentController.php | 180 +-
app/controllers/GatewayprofileController.php | 2 +-
app/controllers/GroupController.php | 54 +
app/controllers/ProjectController.php | 158 +-
app/libraries/AdminUtilities.php | 73 +-
app/libraries/Airavata/API/Airavata.php | 14612 ++++++++++-------
.../Model/AppCatalog/GatewayProfile/Types.php | 92 +
.../Airavata/Model/Experiment/Types.php | 205 +-
app/libraries/Airavata/Model/Group/Types.php | 235 +
app/libraries/Airavata/Model/Job/Types.php | 51 +-
.../Airavata/Model/Messaging/Event/Types.php | 124 +-
app/libraries/Airavata/Model/Process/Types.php | 200 +-
app/libraries/Airavata/Model/Task/Types.php | 122 +-
app/libraries/Airavata/Model/User/Types.php | 121 +-
.../Airavata/Model/Workspace/Types.php | 318 +-
app/libraries/CRUtilities.php | 29 +-
app/libraries/CommonUtilities.php | 36 +-
app/libraries/ExperimentUtilities.php | 126 +-
app/libraries/GrouperUtilities.php | 141 +
app/libraries/ProjectUtilities.php | 90 +-
app/libraries/SharingUtilities.php | 180 +
.../Wsis/Stubs/AuthenticationAdminStub.php | 3 +
app/libraries/Wsis/Wsis.php | 31 +-
.../assets/Profile_avatar_placeholder_large.png | Bin 0 -> 2011 bytes
app/routes.php | 22 +-
app/views/account/dashboard.blade.php | 311 +-
app/views/admin/manage-credentials.blade.php | 12 +-
app/views/admin/manage-experiments.blade.php | 51 +-
app/views/admin/manage-gateway.blade.php | 479 +-
app/views/admin/manage-notices.blade.php | 2 +-
app/views/admin/manage-roles.blade.php | 40 +-
app/views/admin/manage-users.blade.php | 143 +-
app/views/application/module.blade.php | 4 +-
app/views/experiment/create-complete.blade.php | 13 +-
app/views/experiment/create.blade.php | 10 +-
app/views/experiment/edit.blade.php | 13 +-
.../experiment/no-sharing-browse.blade.php | 214 +
.../no-sharing-create-complete.blade.php | 168 +
app/views/experiment/no-sharing-edit.blade.php | 96 +
app/views/experiment/summary.blade.php | 3 +-
app/views/group/browse.blade.php | 0
app/views/group/create.blade.php | 75 +
app/views/group/edit.blade.php | 0
app/views/group/summary.blade.php | 0
app/views/home.blade.php | 41 +-
.../compute-resource-preferences.blade.php | 57 +
app/views/partials/dashboard-block.blade.php | 2 +-
.../partials/experiment-container.blade.php | 20 +-
app/views/partials/experiment-info.blade.php | 102 +-
app/views/partials/experiment-inputs.blade.php | 12 +-
.../partials/sharing-display-body.blade.php | 22 +
app/views/partials/sharing-form-body.blade.php | 17 +
app/views/partials/sharing-form-modal.blade.php | 18 +
app/views/partials/streaming-data.blade.php | 4 +
app/views/project/browse.blade.php | 8 +-
app/views/project/create.blade.php | 15 +-
app/views/project/edit.blade.php | 26 +-
app/views/project/no-sharing-browse.blade.php | 146 +
app/views/project/no-sharing-create.blade.php | 33 +
app/views/project/no-sharing-edit.blade.php | 49 +
app/views/project/no-sharing-summary.blade.php | 103 +
app/views/project/summary.blade.php | 30 +-
.../assets/Profile_avatar_placeholder_large.png | Bin 0 -> 2011 bytes
.../assets/powered-by-airavata-transparent.png | Bin 0 -> 40630 bytes
public/css/sharing.css | 108 +
public/js/sharing/groups.js | 162 +
public/js/sharing/share.js | 340 +
public/js/sharing/sharing_utils.js | 195 +
public/js/simstream.js | 180 +
72 files changed, 14346 insertions(+), 6421 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d8c6e814/app/libraries/ProjectUtilities.php
----------------------------------------------------------------------
diff --cc app/libraries/ProjectUtilities.php
index 16fefc8,4f26782..1a58c61
mode 100644,100755..100755
--- a/app/libraries/ProjectUtilities.php
+++ b/app/libraries/ProjectUtilities.php
[7/7] airavata-php-gateway git commit: AIRAVATA-2181 Null checking
sharing data
Posted by sm...@apache.org.
AIRAVATA-2181 Null checking sharing data
Sharing data won't exist when user doesn't have access to the
experiment.
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/31a70432
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/31a70432
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/31a70432
Branch: refs/heads/develop
Commit: 31a70432b352e4cf81b7805d3d2ed09323da437f
Parents: f4cd14c
Author: Marcus Christie <ma...@iu.edu>
Authored: Tue Oct 25 16:35:18 2016 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Fri Oct 28 10:17:19 2016 -0400
----------------------------------------------------------------------
app/views/partials/experiment-info.blade.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/31a70432/app/views/partials/experiment-info.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-info.blade.php b/app/views/partials/experiment-info.blade.php
index 08fca8e..2bba34c 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -357,7 +357,7 @@
</div>
@endif
-@if(Config::get('pga_config.airavata')["data-sharing-enabled"])
+@if(Config::get('pga_config.airavata')["data-sharing-enabled"] and isset($can_write))
@if($can_write === true)
@include('partials/sharing-form-modal')
@endif
@@ -365,7 +365,7 @@
@section('scripts')
@parent
{{ HTML::script('js/time-conversion.js')}}
-@if(Config::get('pga_config.airavata')["data-sharing-enabled"])
+@if(Config::get('pga_config.airavata')["data-sharing-enabled"] and isset($users) and isset($owner))
<script>
var users = {{ $users }};
var owner = {{ $owner }};