Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
This commit is contained in:
commit
aee1134ca1
@ -409,13 +409,14 @@ class FileMoveCopyOperation<T> : FileOperation<FileMoveCopyOperationData<T>, T>
|
||||
await ProviderDao.UpdateProviderInfoAsync(folder.ProviderId, toFolder.FolderType);
|
||||
}
|
||||
else
|
||||
{
|
||||
try
|
||||
{
|
||||
if (isRoom && toFolder.FolderType == FolderType.VirtualRooms)
|
||||
{
|
||||
await _semaphore.WaitAsync();
|
||||
await countRoomChecker.CheckAppend();
|
||||
newFolderId = await FolderDao.MoveFolderAsync(folder.Id, toFolderId, CancellationToken);
|
||||
_semaphore.Release();
|
||||
}
|
||||
else if (isRoom && toFolder.FolderType == FolderType.Archive)
|
||||
{
|
||||
@ -426,14 +427,21 @@ class FileMoveCopyOperation<T> : FileOperation<FileMoveCopyOperationData<T>, T>
|
||||
{
|
||||
await TagDao.RemoveTags(pins);
|
||||
}
|
||||
_semaphore.Release();
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
newFolderId = await FolderDao.MoveFolderAsync(folder.Id, toFolderId, CancellationToken);
|
||||
}
|
||||
}
|
||||
catch(Exception)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
finally
|
||||
{
|
||||
_semaphore.Release();
|
||||
}
|
||||
}
|
||||
|
||||
if (isRoom)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user