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/11/01 18:14:34 UTC
[1/2] airavata-php-gateway git commit: AIRAVATA-2181 Null checking
sharing data
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 43e098904 -> 10b27a933
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/798c0803
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/798c0803
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/798c0803
Branch: refs/heads/develop
Commit: 798c08030e07d0c4877c9d7e2f9729601b7a7c63
Parents: 26ed2cf
Author: Marcus Christie <ma...@iu.edu>
Authored: Tue Oct 25 16:35:18 2016 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Tue Oct 25 16:35:18 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/798c0803/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 }};
[2/2] airavata-php-gateway git commit: Merge branch
'AIRAVATA-2181-cannot-view-experiment-outputs' of
https://github.com/machristie/airavata-php-gateway into develop
Posted by sc...@apache.org.
Merge branch 'AIRAVATA-2181-cannot-view-experiment-outputs' of https://github.com/machristie/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/10b27a93
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/10b27a93
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/10b27a93
Branch: refs/heads/develop
Commit: 10b27a933c54d7132e42e5c460d83938389bdbb0
Parents: 43e0989 798c080
Author: scnakandala <su...@gmail.com>
Authored: Tue Nov 1 14:13:44 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Nov 1 14:13:44 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------