airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [30/30] airavata-php-gateway git commit: Merge branch 'master' into dreg-gateway
Date Mon, 01 May 2017 17:17:34 GMT
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 <machrist@iu.edu>
Authored: Mon May 1 13:15:19 2017 -0400
Committer: Marcus Christie <machrist@iu.edu>
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 '<div class="form-group">

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5286d2e/app/routes.php
----------------------------------------------------------------------


Mime
View raw message