projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "User profile first pass" into projects
[osm/UI.git]
/
skyquake
/
plugins
/
composer
/
src
/
src
/
components
/
filemanager
/
FileManager.jsx
diff --git
a/skyquake/plugins/composer/src/src/components/filemanager/FileManager.jsx
b/skyquake/plugins/composer/src/src/components/filemanager/FileManager.jsx
index
9772ca8
..
3833ab4
100644
(file)
--- a/
skyquake/plugins/composer/src/src/components/filemanager/FileManager.jsx
+++ b/
skyquake/plugins/composer/src/src/components/filemanager/FileManager.jsx
@@
-183,6
+183,7
@@
function contentFile(context, file, path, key, deleteFn) {
const name = stripPath(file.name, path);
const id = context.props.item.id;
const type = context.props.type;
const name = stripPath(file.name, path);
const id = context.props.item.id;
const type = context.props.type;
+ const downloadHost = API_SERVER.match('localhost') || API_SERVER.match('127.0.0.1') ? `${window.location.protocol}//${window.location.hostname}` : API_SERVER;
//{`${window.location.protocol}//${API_SERVER}:4567/api/package${type}/${id}/${path}/${name}`}
return (
<div className="file" key={key}>
//{`${window.location.protocol}//${API_SERVER}:4567/api/package${type}/${id}/${path}/${name}`}
return (
<div className="file" key={key}>
@@
-192,7
+193,7
@@
function contentFile(context, file, path, key, deleteFn) {
{file.status && (file.status == 'IN_PROGRESS' || file.status == 'DOWNLOADING' ) ? <LoadingIndicator size={2} /> : file.status }
</div>
<div className="file-name">
{file.status && (file.status == 'IN_PROGRESS' || file.status == 'DOWNLOADING' ) ? <LoadingIndicator size={2} /> : file.status }
</div>
<div className="file-name">
- <a target="_blank" href={`${
API_SERVER
}:4567/api/package/${type}/${id}/${path}/${name}`}>{name}</a>
+ <a target="_blank" href={`${
downloadHost
}:4567/api/package/${type}/${id}/${path}/${name}`}>{name}</a>
</div>
</div>
<div className="file-action" style={{display: (!file.status || (file && file.status.toLowerCase() != 'loading...')) ? 'inherit' : 'none', cursor: 'pointer'}} onClick={deleteFn(file.name)}>X</div>
</div>
</div>
<div className="file-action" style={{display: (!file.status || (file && file.status.toLowerCase() != 'loading...')) ? 'inherit' : 'none', cursor: 'pointer'}} onClick={deleteFn(file.name)}>X</div>