github
/
filebrowser
mirror of https://github.com/filebrowser/filebrowser
1
0
Fork 0
Code Issues Releases Wiki Activity

fix file info URL and webdav move destination URL

pull/144/head
Henrique Dias 2017-01-21 21:10:01 +00:00
parent 15e46f99c7
commit ee1536160e
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
_embed/public/js/common.js
View File

@ -137,10 +137,13 @@ webdav.convertURL = function (url) {
webdav.move = function (oldLink, newLink) { webdav.move = function (oldLink, newLink) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let request = new XMLHttpRequest(); let request = new XMLHttpRequest(),
destination = newLink.replace(baseURL + "/", webdavURL + "/");
destination = window.location.origin + destination.substring(prefixURL.length);
request.open('MOVE', webdav.convertURL(oldLink), true); request.open('MOVE', webdav.convertURL(oldLink), true);
request.setRequestHeader('Destination', webdav.convertURL(newLink)); request.setRequestHeader('Destination', destination);
request.onload = () => { request.onload = () => {
if(request.status == 201 || request.status == 204) { if(request.status == 201 || request.status == 204) {
resolve(); resolve();

2
_embed/public/js/listing.js
View File

@ -562,4 +562,4 @@ document.addEventListener('DOMContentLoaded', event => {
document.addEventListener("drop", listing.documentDrop, false); document.addEventListener("drop", listing.documentDrop, false);
} }
}); });

3
_embed/templates/base.tmpl
View File

@ -16,7 +16,8 @@
<script> <script>
var user = JSON.parse('{{ Marshal .User }}'), var user = JSON.parse('{{ Marshal .User }}'),
webdavURL = "{{.Config.AbsoluteURL}}{{.Config.WebDavURL}}", webdavURL = "{{.Config.AbsoluteURL}}{{.Config.WebDavURL}}",
baseURL = "{{.Config.AbsoluteURL}}"; baseURL = "{{.Config.AbsoluteURL}}",
prefixURL = "{{ .Config.PrefixURL }}";
</script> </script>
<script src="{{ .Config.AbsoluteURL }}/_filemanagerinternal/js/common.js" defer></script> <script src="{{ .Config.AbsoluteURL }}/_filemanagerinternal/js/common.js" defer></script>
{{- if .IsDir }} {{- if .IsDir }}

2
file/info.go
View File

@ -36,7 +36,7 @@ type Info struct {
func GetInfo(url *url.URL, c *config.Config, u *config.User) (*Info, int, error) { func GetInfo(url *url.URL, c *config.Config, u *config.User) (*Info, int, error) {
var err error var err error
i := &Info{URL: url.Path} i := &Info{URL: c.PrefixURL + url.Path}
i.VirtualPath = strings.Replace(url.Path, c.BaseURL, "", 1) i.VirtualPath = strings.Replace(url.Path, c.BaseURL, "", 1)
i.VirtualPath = strings.TrimPrefix(i.VirtualPath, "/") i.VirtualPath = strings.TrimPrefix(i.VirtualPath, "/")
i.VirtualPath = "/" + i.VirtualPath i.VirtualPath = "/" + i.VirtualPath