github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-03 03:49:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Deleted documents cannot be rolled back https://github.com/siyuan-note/siyuan/issues/14239

Browse Source
This commit is contained in:
Daniel 2025-03-01 00:08:26 +08:00
parent 51fb0ebb22
commit a8416f39c2
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/model/history.go
View File

@ -245,7 +245,7 @@ func RollbackDocHistory(boxID, historyPath string) (err error) {
} }
} }
destPath, parentHPath, err = getRollbackDockPath(boxID, workingDoc) destPath, parentHPath, err = getRollbackDockPath(boxID, historyPath, workingDoc)
if err != nil { if err != nil {
return return
} }
@ -338,13 +338,16 @@ func RollbackDocHistory(boxID, historyPath string) (err error) {
return nil return nil
} }
func getRollbackDockPath(boxID string, workingDoc *treenode.BlockTree) (destPath, parentHPath string, err error) { func getRollbackDockPath(boxID, historyPath string, workingDoc *treenode.BlockTree) (destPath, parentHPath string, err error) {
var parentID, baseName string var parentID string
baseName := filepath.Base(historyPath)
var parentWorkingDoc *treenode.BlockTree var parentWorkingDoc *treenode.BlockTree
if nil != workingDoc { if nil != workingDoc {
baseName = path.Base(workingDoc.Path)
parentID = path.Base(path.Dir(workingDoc.Path)) parentID = path.Base(path.Dir(workingDoc.Path))
parentWorkingDoc = treenode.GetBlockTree(parentID) parentWorkingDoc = treenode.GetBlockTree(parentID)
} else {
parentID = filepath.Base(filepath.Dir(historyPath))
parentWorkingDoc = treenode.GetBlockTree(parentID)
} }
if nil != parentWorkingDoc { if nil != parentWorkingDoc {