Browse Source

fix: history - handle path move between live and latest versions

pull/1634/head
NGPixel 4 years ago
parent
commit
934842ab9b
1 changed files with 19 additions and 10 deletions
  1. 29
      client/components/history.vue

29
client/components/history.vue

@ -226,16 +226,25 @@ export default {
computed: { computed: {
darkMode: get('site/dark'), darkMode: get('site/dark'),
fullTrail () { fullTrail () {
const liveTrailItem = {
versionId: 0,
authorId: this.authorId,
authorName: this.authorName,
actionType: 'live',
valueBefore: null,
valueAfter: null,
versionDate: this.updatedAt
}
// -> Check for move between latest and live
const prevPage = _.find(this.cache, ['versionId', _.get(this.trail, '[0].versionId', -1)])
if (prevPage && this.path !== prevPage.path) {
liveTrailItem.actionType = 'move'
liveTrailItem.valueBefore = prevPage.path
liveTrailItem.valueAfter = this.path
}
// -> Combine trail with live
return [ return [
{
versionId: 0,
authorId: this.authorId,
authorName: this.authorName,
actionType: 'live',
valueBefore: null,
valueAfter: null,
versionDate: this.updatedAt
},
liveTrailItem,
...this.trail ...this.trail
] ]
}, },
@ -480,7 +489,7 @@ export default {
case 'edit': case 'edit':
return '' // 'mdi-pencil' return '' // 'mdi-pencil'
case 'move': case 'move':
return 'forward'
return 'mdi-forward'
case 'initial': case 'initial':
return 'mdi-plus' return 'mdi-plus'
case 'live': case 'live':

Loading…
Cancel
Save