aboutsummaryrefslogtreecommitdiff
path: root/weed/server
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2022-12-10 21:49:09 -0800
committerchrislu <chris.lu@gmail.com>2022-12-10 21:49:09 -0800
commit38c63c429be12c5038b7b4c38f9d9e2dcdb1f1d8 (patch)
tree107eac4fae450b741b2cd75784d1a4f2d2eb0011 /weed/server
parente1ca6308cb66e25692d8b874715f61c940fa5b91 (diff)
parent549354e324038d027134babb5294b7c7e820a12b (diff)
downloadseaweedfs-38c63c429be12c5038b7b4c38f9d9e2dcdb1f1d8.tar.xz
seaweedfs-38c63c429be12c5038b7b4c38f9d9e2dcdb1f1d8.zip
Merge branch 'master' of https://github.com/seaweedfs/seaweedfs
Diffstat (limited to 'weed/server')
-rw-r--r--weed/server/filer_grpc_server_rename.go1
-rw-r--r--weed/server/filer_ui/filer.html2
2 files changed, 2 insertions, 1 deletions
diff --git a/weed/server/filer_grpc_server_rename.go b/weed/server/filer_grpc_server_rename.go
index 8a3a8f07f..ff682da43 100644
--- a/weed/server/filer_grpc_server_rename.go
+++ b/weed/server/filer_grpc_server_rename.go
@@ -202,6 +202,7 @@ func (fs *FilerServer) moveSelfEntry(ctx context.Context, stream filer_pb.Seawee
}
// delete old entry
+ ctx = context.WithValue(ctx, "OP", "MV")
deleteErr := fs.filer.DeleteEntryMetaAndData(ctx, oldPath, false, false, false, false, signatures)
if deleteErr != nil {
return deleteErr
diff --git a/weed/server/filer_ui/filer.html b/weed/server/filer_ui/filer.html
index ef9ef75fb..28425f180 100644
--- a/weed/server/filer_ui/filer.html
+++ b/weed/server/filer_ui/filer.html
@@ -337,7 +337,7 @@
}
var url = basePath + encodeURIComponent(newName);
var originPath = basePath + originName;
- url += '?mv.from=' + originPath;
+ url += '?mv.from=' + encodeURIComponent(originPath);
var xhr = new XMLHttpRequest();
xhr.open('POST', url, false);
xhr.setRequestHeader('Content-Type', '');