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 #13575 from overleaf/msm-ce-sp-hotfix-3-5-8--4-0-3

Browse source 
CE/SP hotfixes 3.5.8 and 4.0.3

GitOrigin-RevId: c9ed39553154065d5eb59dfa0096756a2b1b1211
This commit is contained in:
Miguel Serrano 2023-06-29 12:47:20 +02:00 committed by Copybot
parent 8402081d9b
commit ad006205ec
4 changed files with 56 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1,5 @@
FROM sharelatex/sharelatex:3.5.7
# Patch: fixes anonymous edits breaking history
COPY pr_13574.patch .
RUN patch -p0 < pr_13574.patch

22
server-ce/hotfix/3.5.8/pr_13574.patch Normal file
View file

@ -0,0 +1,22 @@
--- services/project-history/app/js/UpdateTranslator.js
+++ services/project-history/app/js/UpdateTranslator.js
@@ -73,9 +73,18 @@ function _convertToChange(projectId, updateWithBlob) {
throw error
}
+ let v2Authors
+ if (update.meta.user_id === 'anonymous-user') {
+ // history-v1 uses null to represent an anonymous author
+ v2Authors = [null]
+ } else {
+ // user_id is missing on resync operations that update the contents of a doc
+ v2Authors = _.compact([update.meta.user_id])
+ }
+
const rawChange = {
operations,
- v2Authors: _.compact([update.meta.user_id]),
+ v2Authors,
timestamp: new Date(update.meta.ts).toISOString(),
projectVersion,
v2DocVersions: Object.keys(v2DocVersions).length ? v2DocVersions : null,

7
server-ce/hotfix/4.0.3/Dockerfile Normal file
View file

@ -0,0 +1,7 @@
# 4.0.1 was tagged as 4.0.2 in dockerhub to keep parity with Server Pro
FROM sharelatex/sharelatex:4.0.1
# Patch: fixes anonymous edits breaking history
COPY pr_13574.patch .
RUN patch -p0 < pr_13574.patch

22
server-ce/hotfix/4.0.3/pr_13574.patch Normal file
View file

@ -0,0 +1,22 @@
--- services/project-history/app/js/UpdateTranslator.js
+++ services/project-history/app/js/UpdateTranslator.js
@@ -73,9 +73,18 @@ function _convertToChange(projectId, updateWithBlob) {
throw error
}
+ let v2Authors
+ if (update.meta.user_id === 'anonymous-user') {
+ // history-v1 uses null to represent an anonymous author
+ v2Authors = [null]
+ } else {
+ // user_id is missing on resync operations that update the contents of a doc
+ v2Authors = _.compact([update.meta.user_id])
+ }
+
const rawChange = {
operations,
- v2Authors: _.compact([update.meta.user_id]),
+ v2Authors,
timestamp: new Date(update.meta.ts).toISOString(),
projectVersion,
v2DocVersions: Object.keys(v2DocVersions).length ? v2DocVersions : null,