Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
1fa7ee311e
@ -37,7 +37,7 @@ export default {
|
|||||||
previewUrl: function(username, file, token, shareToken, serverUrl) {
|
previewUrl: function(username, file, token, shareToken, serverUrl) {
|
||||||
let baseUrl = serverUrl || this.baseUrl
|
let baseUrl = serverUrl || this.baseUrl
|
||||||
let fileUrl = `${baseUrl}/file/${store.getters.name}${encodeURIComponent(file.path)}${encodeURIComponent(file.name)}`
|
let fileUrl = `${baseUrl}/file/${store.getters.name}${encodeURIComponent(file.path)}${encodeURIComponent(file.name)}`
|
||||||
fileUrl = fileUrl.replaceAll(/%5C/g, '/')
|
fileUrl = fileUrl.replaceAll(/%5C|%2F/g, '/')
|
||||||
|
|
||||||
if (file.userId !== store.getters.userId && token && !shareToken) {
|
if (file.userId !== store.getters.userId && token && !shareToken) {
|
||||||
return `${baseUrl}/pre-file/${file.id}/${encodeURIComponent(file.name)}`
|
return `${baseUrl}/pre-file/${file.id}/${encodeURIComponent(file.name)}`
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user