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 2018/06/07 20:52:59 UTC
[airavata-php-gateway] branch develop updated (8358e6b -> 0988d03)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-php-gateway.git.
from 8358e6b AIRAVATA-2781 Using userHasAccess to test migration script
add eb190c0 Added Class selectors to the rows in Experiment Summary to facilitate hiding
add c6b6f62 Merge pull request #82 from stephenpaul2727/add_selectors
add eda3b65 Merge pull request #81 from stephenpaul2727/AIRAVATA-2675
add 82b896f Merge branch 'password-ampersand-validation'
add 52351bd Merge remote-tracking branch 'origin/AIRAVATA-2500'
add 81d59ea AIRAVATA-2500 Don't display Additional Info if account is all set up
add 0054c6b AIRAVATA-2798 encode special characters in filenames
new 88ffd28 Removing links from input/output files when file doesn't exist
new 9b86f0d File download unavailable icon/tooltip
new 0988d03 Merge branch 'handle-deleted-files' into develop
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
app/libraries/ExperimentUtilities.php | 33 ++++++++++++++++------
.../partials/auto-provisioned-accounts.blade.php | 9 ++++--
app/views/partials/experiment-info.blade.php | 11 ++++----
public/js/filemanager.js | 4 +--
4 files changed, 40 insertions(+), 17 deletions(-)
--
To stop receiving notification emails like this one, please contact
machristie@apache.org.
[airavata-php-gateway] 01/03: Removing links from input/output
files when file doesn't exist
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-php-gateway.git
commit 88ffd282d68026a24e33a403274b2c6d68f56088
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Thu Jun 7 16:35:25 2018 -0400
Removing links from input/output files when file doesn't exist
---
app/libraries/ExperimentUtilities.php | 32 ++++++++++++++++++++++++--------
1 file changed, 24 insertions(+), 8 deletions(-)
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index b5c2100..7ccbb1c 100755
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -99,8 +99,13 @@ class ExperimentUtilities
$fileName = basename($input->value);
}
- echo '<p>' . $input->name . ': <a target="_blank" href="' . URL::to("/") . '/download/?id='
- . $input->value . '">' . $fileName . ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
+ $path = parse_url($currentInputPath)['path'];
+ if(file_exists($path)){
+ echo '<p>' . $input->name . ': <a target="_blank" href="' . URL::to("/") . '/download/?id='
+ . $input->value . '">' . $fileName . ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
+ } else {
+ echo '<p>' . $input->name . ': ' . $fileName . '</p>';
+ }
}else if($input->type == DataType::URI_COLLECTION) {
$uriList = $input->value;
@@ -121,8 +126,13 @@ class ExperimentUtilities
$fileName = basename($input->value);
}
- $optFilesHtml = $optFilesHtml . '<a target="_blank" href="' . URL::to("/") . '/download/?id='
- . $uri . '">' . $fileName . ' <span class="glyphicon glyphicon-new-window"></span></a> ';
+ $path = parse_url($currentInputPath)['path'];
+ if(file_exists($path)){
+ $optFilesHtml = $optFilesHtml . '<a target="_blank" href="' . URL::to("/") . '/download/?id='
+ . $uri . '">' . $fileName . ' <span class="glyphicon glyphicon-new-window"></span></a> ';
+ } else {
+ $optFilesHtml = $optFilesHtml . $fileName . ' ';
+ }
}
@@ -965,17 +975,23 @@ class ExperimentUtilities
}
}
$path = parse_url($currentOutputPath)['path'];
+ $fileName = basename($currentOutputPath);
if(file_exists($path)){
- $fileName = basename($currentOutputPath);
echo '<p>' . $output->name . ': <a target="_blank" href="' . URL::to("/")
. '/download/?id=' . urlencode($output->value) . '">' . $fileName
. ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
+ } else {
+ echo '<p>' . $output->name . ': ' . $fileName . ' </p>';
}
}else {
$fileName = basename($output->value);
- echo '<p>' . $output->name . ': <a target="_blank" href="' . URL::to("/")
- . '/download/?id=' . urlencode($output->value) . '">' . $fileName
- . ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
+ if(file_exists($path)){
+ echo '<p>' . $output->name . ': <a target="_blank" href="' . URL::to("/")
+ . '/download/?id=' . urlencode($output->value) . '">' . $fileName
+ . ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
+ } else {
+ echo '<p>' . $output->name . ': ' . $fileName . ' </p>';
+ }
}
}
} elseif ($output->type == DataType::STRING) {
--
To stop receiving notification emails like this one, please contact
machristie@apache.org.
[airavata-php-gateway] 02/03: File download unavailable icon/tooltip
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-php-gateway.git
commit 9b86f0d83077d0a16ab3337f5a94abfc6053a920
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Thu Jun 7 16:51:52 2018 -0400
File download unavailable icon/tooltip
---
app/libraries/ExperimentUtilities.php | 9 +++++----
app/views/partials/experiment-info.blade.php | 1 +
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 7ccbb1c..dca71f7 100755
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -27,6 +27,7 @@ use Airavata\Model\Group\ResourcePermissionType;
class ExperimentUtilities
{
+ const FILE_UNAVAILABLE_ICON_TOOLTIP = ' <span class="glyphicon glyphicon-warning-sign" data-toggle="tooltip" data-placement="right" title="File is not available for download."></span></p>';
private static $experimentPath;
private static $relativeExperimentDataDir;
@@ -104,7 +105,7 @@ class ExperimentUtilities
echo '<p>' . $input->name . ': <a target="_blank" href="' . URL::to("/") . '/download/?id='
. $input->value . '">' . $fileName . ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
} else {
- echo '<p>' . $input->name . ': ' . $fileName . '</p>';
+ echo '<p>' . $input->name . ': ' . $fileName . self::FILE_UNAVAILABLE_ICON_TOOLTIP;
}
}else if($input->type == DataType::URI_COLLECTION) {
@@ -131,7 +132,7 @@ class ExperimentUtilities
$optFilesHtml = $optFilesHtml . '<a target="_blank" href="' . URL::to("/") . '/download/?id='
. $uri . '">' . $fileName . ' <span class="glyphicon glyphicon-new-window"></span></a> ';
} else {
- $optFilesHtml = $optFilesHtml . $fileName . ' ';
+ $optFilesHtml = $optFilesHtml . $fileName . self::FILE_UNAVAILABLE_ICON_TOOLTIP;
}
}
@@ -981,7 +982,7 @@ class ExperimentUtilities
. '/download/?id=' . urlencode($output->value) . '">' . $fileName
. ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
} else {
- echo '<p>' . $output->name . ': ' . $fileName . ' </p>';
+ echo '<p>' . $output->name . ': ' . $fileName . self::FILE_UNAVAILABLE_ICON_TOOLTIP . ' </p>';
}
}else {
$fileName = basename($output->value);
@@ -990,7 +991,7 @@ class ExperimentUtilities
. '/download/?id=' . urlencode($output->value) . '">' . $fileName
. ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
} else {
- echo '<p>' . $output->name . ': ' . $fileName . ' </p>';
+ echo '<p>' . $output->name . ': ' . $fileName . self::FILE_UNAVAILABLE_ICON_TOOLTIP . ' </p>';
}
}
}
diff --git a/app/views/partials/experiment-info.blade.php b/app/views/partials/experiment-info.blade.php
index ecc71b4..e174900 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -446,6 +446,7 @@
}
return false;
});
+ $('[data-toggle="tooltip"]').tooltip();
</script>
--
To stop receiving notification emails like this one, please contact
machristie@apache.org.
[airavata-php-gateway] 03/03: Merge branch 'handle-deleted-files'
into develop
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-php-gateway.git
commit 0988d038d5fd81dd42657907e0e1e91122d5d0de
Merge: 8358e6b 9b86f0d
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Thu Jun 7 16:52:26 2018 -0400
Merge branch 'handle-deleted-files' into develop
app/libraries/ExperimentUtilities.php | 33 ++++++++++++++++------
.../partials/auto-provisioned-accounts.blade.php | 9 ++++--
app/views/partials/experiment-info.blade.php | 11 ++++----
public/js/filemanager.js | 4 +--
4 files changed, 40 insertions(+), 17 deletions(-)
--
To stop receiving notification emails like this one, please contact
machristie@apache.org.