github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-14 20:40:17 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14962 from overleaf/jpa-server-pro-3-5-12

Browse source 
[server-pro] add hotfix 3.5.12 for fixing matching version error

GitOrigin-RevId: 38611806f6226ad9c7331b5868aa112ced16abd0
This commit is contained in:
Jakob Ackermann 2023-09-25 12:23:00 +02:00 committed by Copybot
parent 9759a29d75
commit d9db49d565
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
server-ce/hotfix/3.5.12/Dockerfile Normal file
View file

@ -0,0 +1,5 @@
FROM sharelatex/sharelatex:3.5.11
# Patch: fix matching version when rewinding history
COPY fix-matching-version-error.patch .
RUN patch -p0 < fix-matching-version-error.patch

22
server-ce/hotfix/3.5.12/fix-matching-version-error.patch Normal file
View file

@ -0,0 +1,22 @@
--- services/track-changes/app/js/ZipManager.js
+++ services/track-changes/app/js/ZipManager.js
@@ -95,6 +95,19 @@ async function rewindDoc(projectId, docId, zipfile) {
continue
}
+ if (previousUpdate && update.v >= previousUpdate.v) {
+ logger.warn(
+ {
+ projectId,
+ docId,
+ previousUpdateVersion: previousUpdate.v,
+ updateVersion: update.v,
+ },
+ 'adjusting version for update with matching version'
+ )
+ update.v = previousUpdate.v - 1
+ }
+
const updatePath = `${id}/updates/${update.v}`
try {