Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 14AF1200B3C for ; Wed, 13 Jul 2016 21:38:32 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 132F2160A6A; Wed, 13 Jul 2016 19:38:32 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5CE40160A7C for ; Wed, 13 Jul 2016 21:38:31 +0200 (CEST) Received: (qmail 71389 invoked by uid 500); 13 Jul 2016 19:38:30 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 71225 invoked by uid 99); 13 Jul 2016 19:38:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Jul 2016 19:38:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 45CC6E04D9; Wed, 13 Jul 2016 19:38:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: smarru@apache.org To: commits@airavata.apache.org Date: Wed, 13 Jul 2016 19:38:32 -0000 Message-Id: <6c062802b1294ed39ef47be33685fbdc@git.apache.org> In-Reply-To: <96ecb15724c7472aa277dd1c96201b13@git.apache.org> References: <96ecb15724c7472aa277dd1c96201b13@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] airavata-php-gateway git commit: project sharing functionality in place archived-at: Wed, 13 Jul 2016 19:38:32 -0000 project sharing functionality in place 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/f53bcb74 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f53bcb74 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f53bcb74 Branch: refs/heads/grouper-integration Commit: f53bcb74cb7c783e2d30495e7b74dd3a743e8e3b Parents: d24edec Author: Jeff Kinnison Authored: Wed Jul 13 14:24:22 2016 -0400 Committer: Jeff Kinnison Committed: Wed Jul 13 14:24:22 2016 -0400 ---------------------------------------------------------------------- app/libraries/ProjectUtilities.php | 6 ++++++ app/views/project/edit.blade.php | 2 +- public/css/sharing.css | 4 ++++ public/js/sharing/share.js | 6 ++++-- 4 files changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f53bcb74/app/libraries/ProjectUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/ProjectUtilities.php b/app/libraries/ProjectUtilities.php index bc13fcd..ab269db 100644 --- a/app/libraries/ProjectUtilities.php +++ b/app/libraries/ProjectUtilities.php @@ -190,6 +190,10 @@ class ProjectUtilities $updatedProject->owner = $projectDetails["owner"]; $updatedProject->name = $projectDetails["name"]; $updatedProject->description = $projectDetails["description"]; + $updatedProject->gatewayId = Config::get('pga_config.airavata')['gateway-id']; + + $share = $_POST['share-settings']; + try { Airavata::updateProject(Session::get('authz-token'), $projectId, $updatedProject); @@ -203,6 +207,8 @@ class ProjectUtilities } catch (AiravataSystemException $ase) { CommonUtilities::print_error_message('AiravataSystemException!

' . $ase->getMessage()); } + + ProjectUtilities::share_project($projectId, json_decode($share)); } http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f53bcb74/app/views/project/edit.blade.php ---------------------------------------------------------------------- diff --git a/app/views/project/edit.blade.php b/app/views/project/edit.blade.php index 62a976a..6b3e493 100755 --- a/app/views/project/edit.blade.php +++ b/app/views/project/edit.blade.php @@ -43,7 +43,7 @@
- +
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f53bcb74/public/css/sharing.css ---------------------------------------------------------------------- diff --git a/public/css/sharing.css b/public/css/sharing.css index 426cd20..5153ca3 100755 --- a/public/css/sharing.css +++ b/public/css/sharing.css @@ -54,6 +54,10 @@ box-shadow: 0 1px 1px rgba(0,0,0,.075); } +.share-box-users-item :hover { + border-color: #888888; +} + .sharing-thumbnail-unshare { display: none; } http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f53bcb74/public/js/sharing/share.js ---------------------------------------------------------------------- diff --git a/public/js/sharing/share.js b/public/js/sharing/share.js index e059193..fdd7c9f 100755 --- a/public/js/sharing/share.js +++ b/public/js/sharing/share.js @@ -218,13 +218,15 @@ $(function() { $('#shared-users').empty(); if ($original_shared_list.length > 0) { $original_shared_list.each(function(index, element) { - var $e, data; + var $e, data, access; $e = $(element); data = $e.data(); if (data.hasOwnProperty('currentaccess')) { data.currentaccess = data.access; } - $e.find('select').val(data.access).prop('disabled', true); + access = (data.access.write ? access_enum.WRITE : access_enum.READ); + $e.find('.sharing-thumbnail-access').val(access).prop('disabled', true).hide(); + $e.find('.sharing-thumbnail-access-text').text(access_text[access]).show(); $e.find('.sharing-thumbnail-unshare').hide(); }); $('shared-users').removeClass('text-align-center');