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/17 15:32:51 UTC
[04/20] airavata-php-gateway git commit: updated views to incorporate
new user loading scheme
updated views to incorporate new user loading scheme
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/b742a238
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b742a238
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b742a238
Branch: refs/heads/develop
Commit: b742a2381e4b3e0fcb8b2e2a105781fcc943532d
Parents: 84f160a
Author: Jeff Kinnison <je...@gmail.com>
Authored: Thu Aug 4 12:43:22 2016 -0400
Committer: Jeff Kinnison <je...@gmail.com>
Committed: Thu Aug 4 12:43:22 2016 -0400
----------------------------------------------------------------------
app/controllers/ProjectController.php | 3 +--
app/views/experiment/create-complete.blade.php | 1 +
app/views/experiment/edit.blade.php | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b742a238/app/controllers/ProjectController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ProjectController.php b/app/controllers/ProjectController.php
index c98f35e..bcd763e 100755
--- a/app/controllers/ProjectController.php
+++ b/app/controllers/ProjectController.php
@@ -25,8 +25,7 @@ class ProjectController extends BaseController
public function createView()
{
- $users = array();
- //var_dump($users);exit;
+ $users = SharingUtilities::getAllUserProfiles();
return View::make("project/create", array("users" => json_encode($users)));
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b742a238/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
old mode 100644
new mode 100755
index c3976bb..a297694
--- 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 }};
+ $('#experiment-share').data({url: "{{URL::to('/')}}/project/unshared-users", resourceId: "{{$expInputs['project']}}"})
</script>
{{ HTML::script('js/sharing/sharing_utils.js') }}
{{ HTML::script('js/sharing/share.js') }}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b742a238/app/views/experiment/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/edit.blade.php b/app/views/experiment/edit.blade.php
index a991bd1..ef630b0 100755
--- a/app/views/experiment/edit.blade.php
+++ b/app/views/experiment/edit.blade.php
@@ -54,6 +54,7 @@
@parent
<script>
var users = {{ $users }};
+ $('#experiment-share').data({url: "{{URL::to('/')}}/experiment/unshared-users", resourceId: "{{Input::get('expId')}}"})
</script>
{{ HTML::script('js/sharing/sharing_utils.js') }}
{{ HTML::script('js/sharing/share.js') }}