You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/11/06 17:07:02 UTC
[airavata-php-gateway] branch master updated: AIRAVATA-3257 Remove
metaData location code branch (no longer used)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-php-gateway.git
The following commit(s) were added to refs/heads/master by this push:
new 940f682 AIRAVATA-3257 Remove metaData location code branch (no longer used)
940f682 is described below
commit 940f682c3adc1429c8f7005d6e513fc209e5265f
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Nov 6 12:06:48 2019 -0500
AIRAVATA-3257 Remove metaData location code branch (no longer used)
---
app/libraries/ExperimentUtilities.php | 33 +++++++++++----------------------
1 file changed, 11 insertions(+), 22 deletions(-)
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index dde5f97..fd7bd6f 100755
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -901,29 +901,18 @@ class ExperimentUtilities
}
break;
case DataType::URI:
- if(!empty($input->metaData) && json_decode($input->metaData)->location == "remote"){
-
- echo '<div class="form-group">
- <label for="experiment-input">' . $input->name . '</label>
- <input class="form-control" type="text" name="' . $input->sanitizedFormName .
+ echo '<div class="form-group">
+ <label for="experiment-input">' . $input->name . '</label>
+ <div data-file-id="' . $input->sanitizedFormName . '" class="readBytesButtons btn btn-default btn-xs"
+ data-toggle="modal" style="float: right">view file</div>
+ <div class="file-upload-container">
+ <input class="file-input" type="file" name="' . $input->sanitizedFormName .
'" id="' . $input->sanitizedFormName . '" ' . $required . '>
- <p class="help-block">' . $input->userFriendlyDescription . '</p>
- </div>';
- break;
- }else{
- echo '<div class="form-group">
- <label for="experiment-input">' . $input->name . '</label>
- <div data-file-id="' . $input->sanitizedFormName . '" class="readBytesButtons btn btn-default btn-xs"
- data-toggle="modal" style="float: right">view file</div>
- <div class="file-upload-container">
- <input class="file-input" type="file" name="' . $input->sanitizedFormName .
- '" id="' . $input->sanitizedFormName . '" ' . $required . '>
- <div class="file-upload-max-size">Max Upload Size: ' . $allowedFileSize .'M</div>
- </div>
- <p class="help-block">' . $input->userFriendlyDescription . '</p>
- </div>';
- break;
- }
+ <div class="file-upload-max-size">Max Upload Size: ' . $allowedFileSize .'M</div>
+ </div>
+ <p class="help-block">' . $input->userFriendlyDescription . '</p>
+ </div>';
+ break;
case DataType::URI_COLLECTION:
// Support for URI_COLLECTION is not implemented in PGA, just ignore
break;