diff --git a/app/src/history/diff.ts b/app/src/history/diff.ts index 91c810b03..053605c09 100644 --- a/app/src/history/diff.ts +++ b/app/src/history/diff.ts @@ -104,7 +104,7 @@ export const showDiff = (data: { id: string, time: string }[]) => { } let left: string; let right: string; - if (data[0].time < data[1].time) { + if (data[0].time > data[1].time) { left = data[1].id; right = data[0].id; } else { diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 6bbad6c9c..c8bdc886b 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -175,6 +175,22 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) { }, } luteEngine := NewLute() + for _, removeRight := range diff.RemovesRight { + title, parseErr := parseTitleInSnapshot(removeRight.ID, repo, luteEngine) + if "" == title || nil != parseErr { + continue + } + + ret.RemovesRight = append(ret.RemovesRight, &DiffFile{ + FileID: removeRight.ID, + Title: title, + Updated: removeRight.Updated, + }) + } + if 1 > len(ret.RemovesRight) { + ret.RemovesRight = []*DiffFile{} + } + for _, addLeft := range diff.AddsLeft { title, parseErr := parseTitleInSnapshot(addLeft.ID, repo, luteEngine) if "" == title || nil != parseErr { @@ -222,22 +238,6 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) { if 1 > len(ret.UpdatesRight) { ret.UpdatesRight = []*DiffFile{} } - - for _, removeRight := range diff.RemovesRight { - title, parseErr := parseTitleInSnapshot(removeRight.ID, repo, luteEngine) - if "" == title || nil != parseErr { - continue - } - - ret.RemovesRight = append(ret.RemovesRight, &DiffFile{ - FileID: removeRight.ID, - Title: title, - Updated: removeRight.Updated, - }) - } - if 1 > len(ret.RemovesRight) { - ret.RemovesRight = []*DiffFile{} - } return }