diff --git a/changes/CA-5107.other b/changes/CA-5107.other new file mode 100644 index 00000000000..68cb0d5ba11 --- /dev/null +++ b/changes/CA-5107.other @@ -0,0 +1 @@ +- Re-enable forbidding tus-replace when document is locked by another user. [njohner] diff --git a/opengever/api/tests/test_tus.py b/opengever/api/tests/test_tus.py index 1de89edf363..9318efbd8b6 100644 --- a/opengever/api/tests/test_tus.py +++ b/opengever/api/tests/test_tus.py @@ -1,5 +1,4 @@ from base64 import b64encode -from datetime import datetime from ftw.builder import Builder from ftw.builder import create from ftw.testbrowser import browsing @@ -11,7 +10,6 @@ from Products.CMFCore.utils import getToolByName from Products.MimetypesRegistry.MimeTypeItem import MimeTypeItem from six import BytesIO -from unittest import skipIf UPLOAD_DATA = b"abcdefgh" @@ -168,11 +166,6 @@ def test_cannot_replace_document_if_checked_out_by_other(self, browser): self.login(self.regular_user, browser) self.assert_tus_replace_fails(self.document, browser) - @skipIf( - datetime.now() < datetime(2023, 4, 1), - "Lock verification temporary disabled, because it's not yet works correctly. " - "Will be fixed with https://4teamwork.atlassian.net/browse/CA-5107", - ) @browsing def test_cannot_replace_document_if_lock_token_not_provided(self, browser): self.login(self.regular_user, browser) diff --git a/opengever/api/tus.py b/opengever/api/tus.py index 7bf0a8ed716..468f85d76f0 100644 --- a/opengever/api/tus.py +++ b/opengever/api/tus.py @@ -84,9 +84,8 @@ def check_add_modify_permission(self, mode): if self.context.has_file() and not manager.is_checked_out_by_current_user(): raise Forbidden("Document not checked out.") - # Check will be fixed with https://4teamwork.atlassian.net/browse/CA-5107 - # if manager.is_locked_by_other(): - # raise Forbidden("Document is locked.") + if manager.is_locked_by_other(): + raise Forbidden("Document is locked.") if self.is_proposal_document_upload() or self.is_proposal_template_upload(): tus_upload = self.tus_upload()