stable

Clone or download

Read-only

Error when file is locked for edition by another user

Part of: story #12458 DnD on an existing file creates a new version How to test: - With an user, lock a file (from the old UI) - With another user, drop a file on this locked file --> An error is displayed sayiong it is locked. - With the owner of the lock, try to upload a new version of the file --> You should have the previous error. Change-Id: Ib5d9b815237fafe9ccdb8d0a0ae542b7f05268ea

Modified Files

Name
M plugins/docman/include/Docman_SqlFilter.class.php +30 −32 Go to diff View file
M plugins/docman/include/REST/v1/DocmanItemsResource.php +2 −2 Go to diff View file
A plugins/docman/include/REST/v1/ItemLockInfoRepresentation.php +45 −0 Go to diff View file
M plugins/docman/include/REST/v1/ItemRepresentation.php +7 −1 Go to diff View file
M plugins/docman/include/REST/v1/ItemRepresentationBuilder.php +33 −6 Go to diff View file
M plugins/docman/include/docmanPlugin.class.php +2 −1 Go to diff View file
A plugins/docman/phpunit/REST/v1/ItemRepresentationBuilderTest.php +136 −0 Go to diff View file
M plugins/docman/phpunit/REST/v1/ItemRepresentationCollectionBuilderTest.php +1 −0 Go to diff View file
A plugins/document/scripts/document/components/Folder/DragNDrop/DocumentLockedForEditionErrorModal.vue +49 −0 Go to diff View file
M plugins/document/scripts/document/components/Folder/DragNDrop/DragNDropHandler.vue +32 −2 Go to diff View file
M plugins/document/scripts/document/po/fr.po +9 −0 Go to diff View file
M plugins/ldap/tests/LDAP_UserSyncTest.php +13 −11 Go to diff View file
M src/composer.json +2 −1 Go to diff View file
M src/www/include/pre.php +0 −3 Go to diff View file
M tests/lib/TuleapDbTestCase.class.php +0 −2 Go to diff View file
M tests/simpletest/common/tracker/ArtifactImportTest.php +20 −21 Go to diff View file