Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
934842ab
Commit
934842ab
authored
Mar 22, 2020
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: history - handle path move between live and latest versions
parent
50792873
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
10 deletions
+19
-10
history.vue
client/components/history.vue
+19
-10
No files found.
client/components/history.vue
View file @
934842ab
...
...
@@ -226,16 +226,25 @@ export default {
computed
:
{
darkMode
:
get
(
'site/dark'
),
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
[
{
versionId
:
0
,
authorId
:
this
.
authorId
,
authorName
:
this
.
authorName
,
actionType
:
'live'
,
valueBefore
:
null
,
valueAfter
:
null
,
versionDate
:
this
.
updatedAt
},
liveTrailItem
,
...
this
.
trail
]
},
...
...
@@ -480,7 +489,7 @@ export default {
case
'edit'
:
return
''
// 'mdi-pencil'
case
'move'
:
return
'forward'
return
'
mdi-
forward'
case
'initial'
:
return
'mdi-plus'
case
'live'
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment