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 A7DA0200C77 for ; Mon, 1 May 2017 19:17:09 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A6768160BAE; Mon, 1 May 2017 17:17:09 +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 80401160BD5 for ; Mon, 1 May 2017 19:17:07 +0200 (CEST) Received: (qmail 40850 invoked by uid 500); 1 May 2017 17:17:06 -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 39638 invoked by uid 99); 1 May 2017 17:17:05 -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; Mon, 01 May 2017 17:17:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D3D21E1103; Mon, 1 May 2017 17:17:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: machristie@apache.org To: commits@airavata.apache.org Date: Mon, 01 May 2017 17:17:34 -0000 Message-Id: <3c60fae660ec4b6ea513fe66631bf0e2@git.apache.org> In-Reply-To: <839fd470d9a24360b251eff4e3e2c07e@git.apache.org> References: <839fd470d9a24360b251eff4e3e2c07e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/30] airavata-php-gateway git commit: Merge branch 'master' into dreg-gateway archived-at: Mon, 01 May 2017 17:17:09 -0000 Merge branch 'master' into dreg-gateway 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/e5286d2e Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e5286d2e Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e5286d2e Branch: refs/heads/dreg-gateway Commit: e5286d2e8a23d6ec3a400433516a72a5097096de Parents: 1321372 eebf531 Author: Marcus Christie Authored: Mon May 1 13:15:19 2017 -0400 Committer: Marcus Christie Committed: Mon May 1 13:15:19 2017 -0400 ---------------------------------------------------------------------- app/controllers/GatewayController.php | 40 ----- app/controllers/ProjectController.php | 8 +- .../Airavata/Model/Application/Io/Types.php | 23 +++ app/libraries/AppUtilities.php | 3 +- app/libraries/ExperimentUtilities.php | 30 ++-- app/libraries/ProjectUtilities.php | 13 +- app/libraries/SharingUtilities.php | 21 ++- app/resources/security/idp_scigap_org.pem | 156 ++++++++++++------- app/routes.php | 2 + app/views/home.blade.php | 2 +- app/views/partials/dashboard-block.blade.php | 4 - .../partials/interface-input-block.blade.php | 20 ++- .../partials/interface-output-block.blade.php | 8 +- app/views/project/create.blade.php | 1 + public/js/sharing/share.js | 2 +- 15 files changed, 203 insertions(+), 130 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5286d2e/app/libraries/ExperimentUtilities.php ---------------------------------------------------------------------- diff --cc app/libraries/ExperimentUtilities.php index f31667a,447cd7a..982c93b --- a/app/libraries/ExperimentUtilities.php +++ b/app/libraries/ExperimentUtilities.php @@@ -802,9 -784,13 +805,13 @@@ class ExperimentUtilitie if($inputs != null){ array_multisort($order, SORT_ASC, $inputs); } - + //var_dump( $inputs); exit; foreach ($inputs as $input) { + $disabled = ""; + if($input->isReadOnly) + $disabled = "disabled"; + switch ($input->type) { case DataType::STRING: echo '
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5286d2e/app/routes.php ----------------------------------------------------------------------