haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-10 19:29:56 +00:00
Code Issues Releases Wiki Activity

file-download-url-update (#6804)

Browse Source
This commit is contained in:
Ranjiwei
2024-09-20 12:35:42 +08:00
committed by GitHub
parent 404a0e0934
commit 026e66b8ec
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/dir-view-mode/dir-column-nav.js
View File

@@ -269,7 +269,7 @@ class DirColumnNav extends React.Component {
'src': src, 'src': src,
'thumbnail': `${siteRoot}thumbnail/${repoID}/${thumbnailSizeForOriginal}${path}`, 'thumbnail': `${siteRoot}thumbnail/${repoID}/${thumbnailSizeForOriginal}${path}`,
'node': items.find(item => item.path.split('/').pop() === name), 'node': items.find(item => item.path.split('/').pop() === name),
'downloadURL': `${fileServerRoot}repos/${repoID}/files/?op=download&p=${path}`, 'downloadURL': `${fileServerRoot}repos/${repoID}/files${path}/?op=download`,
}; };
}; };

2
frontend/src/components/dirent-grid-view/dirent-grid-view.js
View File

@@ -591,7 +591,7 @@ class DirentGridView extends React.Component {
'url': `${siteRoot}lib/${repoID}/file${path}`, 'url': `${siteRoot}lib/${repoID}/file${path}`,
'thumbnail': `${siteRoot}thumbnail/${repoID}/${thumbnailSizeForOriginal}${path}`, 'thumbnail': `${siteRoot}thumbnail/${repoID}/${thumbnailSizeForOriginal}${path}`,
'src': `${siteRoot}repo/${repoID}/raw${path}?t=${cacheBuster}`, 'src': `${siteRoot}repo/${repoID}/raw${path}?t=${cacheBuster}`,
'downloadURL': `${fileServerRoot}repos/${repoID}/files/?op=download&p=${path}`, 'downloadURL': `${fileServerRoot}repos/${repoID}/files${path}?op=download`,
}; };
}; };

2
frontend/src/components/dirent-list-view/dirent-list-view.js
View File

@@ -189,7 +189,7 @@ class DirentListView extends React.Component {
'url': `${siteRoot}lib/${repoID}/file${path}`, 'url': `${siteRoot}lib/${repoID}/file${path}`,
'thumbnail': `${siteRoot}thumbnail/${repoID}/${thumbnailSizeForOriginal}${path}`, 'thumbnail': `${siteRoot}thumbnail/${repoID}/${thumbnailSizeForOriginal}${path}`,
'src': `${siteRoot}repo/${repoID}/raw${path}`, 'src': `${siteRoot}repo/${repoID}/raw${path}`,
'downloadURL': `${fileServerRoot}repos/${repoID}/files/?op=download&p=${path}`, 'downloadURL': `${fileServerRoot}repos/${repoID}/files${path}/?op=download`,
}; };
}; };

2
frontend/src/metadata/components/cell-editors/file-name-editor.js
View File

@@ -29,7 +29,7 @@ const FileNameEditor = ({ column, record, table, onCommitCancel }) => {
url: `${siteRoot}lib/${repoID}/file${path}`, url: `${siteRoot}lib/${repoID}/file${path}`,
thumbnail: `${siteRoot}thumbnail/${repoID}/${thumbnailSizeForOriginal}${path}`, thumbnail: `${siteRoot}thumbnail/${repoID}/${thumbnailSizeForOriginal}${path}`,
src: src, src: src,
downloadURL: `${fileServerRoot}repos/${repoID}/files/?op=download&p=${path}`, downloadURL: `${fileServerRoot}repos/${repoID}/files${path}/?op=download`,
}; };
}); });
}, [table]); }, [table]);

2
frontend/src/utils/url-decorator.js
View File

@@ -11,7 +11,7 @@ class URLDecorator {
url = siteRoot + 'repo/' + historyRepoID + '/' + options.objID + '/download?' + params; url = siteRoot + 'repo/' + historyRepoID + '/' + options.objID + '/download?' + params;
break; break;
case 'download_file_url': case 'download_file_url':
url = fileServerRoot + 'repos/' + options.repoID + '/files/?p=' + options.filePath + '&op=download'; url = fileServerRoot + 'repos/' + options.repoID + '/files/' + Utils.encodePath(options.filePath) + '/?op=download';
break; break;
case 'file_revisions': case 'file_revisions':
params = 'p=' + Utils.encodePath(options.filePath); params = 'p=' + Utils.encodePath(options.filePath);

4
seahub/utils/__init__.py
View File

@@ -546,10 +546,10 @@ def gen_file_get_url_by_sharelink(token):
def gen_file_get_url_new(repo_id, filepath, op='download'): def gen_file_get_url_new(repo_id, filepath, op='download'):
""" """
Generate fileserver file url. Generate fileserver file url.
Format: http://<domain:port>/repos/<repo_id>files/?p=<filepath>&op=download Format: http://<domain:port>/repos/<repo_id>files/<filepath>/?op=download
""" """
return '%s/repos/%s/files/?p=%s&op=%s' % ( return '%s/repos/%s/files/%s/?op=%s' % (
get_fileserver_root(), get_fileserver_root(),
repo_id, repo_id,
quote(filepath.strip('/')), quote(filepath.strip('/')),