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/10/18 03:52:22 UTC
[3/7] airavata-php-gateway git commit: AIRAVATA-2170 Only owner can
edit sharing
AIRAVATA-2170 Only owner can edit sharing
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/88c9bdf0
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/88c9bdf0
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/88c9bdf0
Branch: refs/heads/develop
Commit: 88c9bdf06e8e1ebfb51bc2bd29c9dadb85dd02e7
Parents: 5d7a4f1
Author: Marcus Christie <ma...@iu.edu>
Authored: Mon Oct 17 10:29:25 2016 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Mon Oct 17 10:29:25 2016 -0400
----------------------------------------------------------------------
app/controllers/ProjectController.php | 4 +++-
app/views/project/edit.blade.php | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/88c9bdf0/app/controllers/ProjectController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ProjectController.php b/app/controllers/ProjectController.php
index 3838898..4c20886 100755
--- a/app/controllers/ProjectController.php
+++ b/app/controllers/ProjectController.php
@@ -102,11 +102,13 @@ class ProjectController extends BaseController
$owner[$project->owner] = $users[$project->owner];
$users = array_diff_key($users, $owner);
}
+ $canEditSharing = strcmp(Session::get("username"), $project->owner) === 0;
return View::make("project/edit",
array("projectId" => Input::get("projId"),
"project" => $project,
"users" => json_encode($users),
- "owner" => json_encode($owner)
+ "owner" => json_encode($owner),
+ "canEditSharing" => $canEditSharing
));
}else {
return Redirect::to('project/summary?projId=' . Input::get("projId"))->with("error", "You do not have permission to edit this project.");
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/88c9bdf0/app/views/project/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/edit.blade.php b/app/views/project/edit.blade.php
index edd8ac9..027bc3c 100755
--- a/app/views/project/edit.blade.php
+++ b/app/views/project/edit.blade.php
@@ -39,7 +39,7 @@
</div>
<div class="form-group">
- @include('partials/sharing-display-body', array('form' => true))
+ @include('partials/sharing-display-body', array('form' => $canEditSharing))
</div>
<div class="btn-toolbar">