IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed room deletion

Browse Source
This commit is contained in:
Maksim Chegulov 2023-03-23 16:53:33 +03:00
parent 16364db1b6
commit 8d54748d55
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
View File

@ -126,6 +126,9 @@ class FileDeleteOperation<T> : FileOperation<FileDeleteOperationData<T>, T>
var folder = await FolderDao.GetFolderAsync(folderId); var folder = await FolderDao.GetFolderAsync(folderId);
var isRoom = DocSpaceHelper.IsRoom(folder.FolderType); var isRoom = DocSpaceHelper.IsRoom(folder.FolderType);
var canDelete = await FilesSecurity.CanDeleteAsync(folder);
checkPermissions = isRoom ? !canDelete : checkPermissions;
T canCalculate = default; T canCalculate = default;
if (folder == null) if (folder == null)
{ {
@ -136,7 +139,7 @@ class FileDeleteOperation<T> : FileOperation<FileDeleteOperationData<T>, T>
{ {
this[Err] = FilesCommonResource.ErrorMassage_SecurityException_DeleteFolder; this[Err] = FilesCommonResource.ErrorMassage_SecurityException_DeleteFolder;
} }
else if (!_ignoreException && checkPermissions && !await FilesSecurity.CanDeleteAsync(folder)) else if (!_ignoreException && checkPermissions && !canDelete)
{ {
canCalculate = FolderDao.CanCalculateSubitems(folderId) ? default : folderId; canCalculate = FolderDao.CanCalculateSubitems(folderId) ? default : folderId;
@ -144,8 +147,6 @@ class FileDeleteOperation<T> : FileOperation<FileDeleteOperationData<T>, T>
} }
else else
{ {
checkPermissions = isRoom ? false : checkPermissions;
canCalculate = FolderDao.CanCalculateSubitems(folderId) ? default : folderId; canCalculate = FolderDao.CanCalculateSubitems(folderId) ? default : folderId;
await fileMarker.RemoveMarkAsNewForAllAsync(folder); await fileMarker.RemoveMarkAsNewForAllAsync(folder);