From 20c3d7ae71c0623ad84da3f1eff71e2b14c2bd87 Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Wed, 21 Apr 2021 13:13:47 +0200 Subject: [PATCH] hotfix 2.6.1 (#875) --- hotfix/2.6.1/Dockerfile | 5 +++++ hotfix/2.6.1/document-deleter-object-id.patch | 10 ++++++++++ 2 files changed, 15 insertions(+) create mode 100644 hotfix/2.6.1/Dockerfile create mode 100644 hotfix/2.6.1/document-deleter-object-id.patch diff --git a/hotfix/2.6.1/Dockerfile b/hotfix/2.6.1/Dockerfile new file mode 100644 index 0000000000..6df467b09b --- /dev/null +++ b/hotfix/2.6.1/Dockerfile @@ -0,0 +1,5 @@ +FROM sharelatex/sharelatex:2.6.0-RC1 + +# Patch: fixes Project restore inserts bad projectId into deletedFiles +COPY document-deleter-object-id.patch ${baseDir} +RUN cd ${baseDir} && patch -p0 < document-deleter-object-id.patch diff --git a/hotfix/2.6.1/document-deleter-object-id.patch b/hotfix/2.6.1/document-deleter-object-id.patch new file mode 100644 index 0000000000..a92ce49a13 --- /dev/null +++ b/hotfix/2.6.1/document-deleter-object-id.patch @@ -0,0 +1,10 @@ +--- /var/www/sharelatex/web/app/src/Features/Project/ProjectDeleter.js ++++ /var/www/sharelatex/web/app/src/Features/Project/ProjectDeleter.js +@@ -278,6 +278,7 @@ async function deleteProject(projectId, options = {}) { + } + + async function undeleteProject(projectId, options = {}) { ++ projectId = ObjectId(projectId) + let deletedProject = await DeletedProject.findOne({ + 'deleterData.deletedProjectId': projectId + }).exec()