Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-04 15:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🐛 Unable to roll back document history https://github.com/siyuan-note/siyuan/issues/10846

Browse source
This commit is contained in:
Daniel 2024-04-03 08:58:30 +08:00
parent e4fe17853c
commit e44db5d248
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
kernel/model/history.go
View file

@ -333,9 +333,10 @@ type History struct {
}
type HistoryItem struct {
Title string `json:"title"`
Path string `json:"path"`
Op string `json:"op"`
Title string `json:"title"`
Path string `json:"path"`
Op string `json:"op"`
Notebook string `json:"notebook"` // 仅用于文档历史
}
const fileHistoryPageSize = 32
@ -766,6 +767,13 @@ func fromSQLHistories(sqlHistories []*sql.History) (ret []*HistoryItem) {
}
if HistoryTypeAsset == sqlHistory.Type {
item.Path = filepath.ToSlash(strings.TrimPrefix(item.Path, util.WorkspaceDir))
} else {
parts := strings.Split(sqlHistory.Path, "/")
if 2 <= len(parts) {
item.Notebook = parts[1]
} else {
logging.LogWarnf("invalid doc history path [%s]", item.Path)
}
}
ret = append(ret, item)
}