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/08/18 14:17:07 UTC
[1/3] airavata-php-gateway git commit: fixed experiment ownership
nomenclature issue
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop f5ff011aa -> 21748deb1
fixed experiment ownership nomenclature 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/81628aaa
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/81628aaa
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/81628aaa
Branch: refs/heads/develop
Commit: 81628aaa47b7c27395cccb640708a4bfe1706467
Parents: face8c5
Author: Jeff Kinnison <je...@gmail.com>
Authored: Wed Aug 17 13:40:03 2016 -0400
Committer: Jeff Kinnison <je...@gmail.com>
Committed: Wed Aug 17 13:40:03 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/81628aaa/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 631cb98..9cc63a5 100755
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -1326,9 +1326,9 @@ class ExperimentUtilities
*/
private static function share_experiment($expId, $users) {
$experiment = ExperimentUtilities::get_experiment($expId);
- $users->{$experiment->owner} = new stdClass();
- $users->{$experiment->owner}->read = true;
- $users->{$experiment->owner}->write = true;
+ $users->{$experiment->userName} = new stdClass();
+ $users->{$experiment->userName}->read = true;
+ $users->{$experiment->userName}->write = true;
$wadd = array();
$wrevoke = array();
[3/3] airavata-php-gateway git commit: Merge branch
'grouper-integration' of https://github.com/jeffkinnison/airavata-php-gateway
into develop
Posted by sc...@apache.org.
Merge branch 'grouper-integration' of https://github.com/jeffkinnison/airavata-php-gateway into develop
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
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/21748deb
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/21748deb
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/21748deb
Branch: refs/heads/develop
Commit: 21748deb1742b0f5e05ae4f083570504cf33f818
Parents: f5ff011 9ff7296
Author: scnakandala <su...@gmail.com>
Authored: Thu Aug 18 10:16:58 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Aug 18 10:16:58 2016 -0400
----------------------------------------------------------------------
app/controllers/ExperimentController.php | 3 ++-
app/libraries/ExperimentUtilities.php | 6 +++---
app/views/experiment/create-complete.blade.php | 1 +
3 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/21748deb/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
[2/3] airavata-php-gateway git commit: Fixed create-complete screen
Posted by sc...@apache.org.
Fixed create-complete screen
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/9ff72964
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/9ff72964
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/9ff72964
Branch: refs/heads/develop
Commit: 9ff72964597e971cd43487c60bc06e57dbd6ce98
Parents: 81628aa
Author: Jeff Kinnison <je...@gmail.com>
Authored: Wed Aug 17 13:56:27 2016 -0400
Committer: Jeff Kinnison <je...@gmail.com>
Committed: Wed Aug 17 13:56:27 2016 -0400
----------------------------------------------------------------------
app/controllers/ExperimentController.php | 3 ++-
app/views/experiment/create-complete.blade.php | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/9ff72964/app/controllers/ExperimentController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php
index 2cee7ab..3a3dcda 100755
--- a/app/controllers/ExperimentController.php
+++ b/app/controllers/ExperimentController.php
@@ -74,8 +74,9 @@ class ExperimentController extends BaseController
);
$users = SharingUtilities::getProfilesForSharedUsers($_POST['project'], ResourceType::PROJECT);
+ $owner = array();
- return View::make("experiment/create-complete", array("expInputs" => $experimentInputs, "users" => json_encode($users)));
+ return View::make("experiment/create-complete", array("expInputs" => $experimentInputs, "users" => json_encode($users), "owner" => json_encode($owner)));
} else if (isset($_POST['save']) || isset($_POST['launch'])) {
$expId = ExperimentUtilities::create_experiment();
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/9ff72964/app/views/experiment/create-complete.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/create-complete.blade.php b/app/views/experiment/create-complete.blade.php
index ef76bcd..7ae755a 100755
--- a/app/views/experiment/create-complete.blade.php
+++ b/app/views/experiment/create-complete.blade.php
@@ -46,6 +46,7 @@
@parent
<script>
var users = {{ $users }};
+ var owner = {{ $owner }};
$('#project-share').data({url: "{{URL::to('/')}}/project/unshared-users", resourceId: "{{$expInputs['project']}}"})
</script>
{{ HTML::script('js/sharing/sharing_utils.js') }}