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

Merge branch 'master' into feature/files

Browse Source
This commit is contained in:
Nikita Gopienko 2020-03-25 09:06:18 +03:00
commit 211591dc6b
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/Server/Core/Dao/TeamlabDao/FolderDao.cs
View File

@ -408,8 +408,9 @@ namespace ASC.Files.Core.Data
var treeToDelete = FilesDbContext.Tree.Where(r => subfolders.Any(a => r.FolderId == a));
FilesDbContext.Tree.RemoveRange(treeToDelete);
var subfoldersStrings = subfolders.Select(r => r.ToString()).ToList();
var linkToDelete = Query(FilesDbContext.TagLink)
.Where(r => subfolders.Any(a => r.EntryId == a.ToString()))
.Where(r => subfoldersStrings.Any(a => r.EntryId == a))
.Where(r => r.EntryType == FileEntryType.Folder);
FilesDbContext.TagLink.RemoveRange(linkToDelete);
@ -419,7 +420,7 @@ namespace ASC.Files.Core.Data
FilesDbContext.Tag.RemoveRange(tagsToRemove);
var securityToDelete = Query(FilesDbContext.Security)
.Where(r => subfolders.Any(a => r.EntryId == a.ToString()))
.Where(r => subfoldersStrings.Any(a => r.EntryId == a))
.Where(r => r.EntryType == FileEntryType.Folder);
FilesDbContext.Security.RemoveRange(securityToDelete);
@ -603,7 +604,7 @@ namespace ASC.Files.Core.Data
var parentIdString = parentId.ToString();
var count = FilesDbContext.Tree
.Where(r => r.ParentId.ToString() == parentIdString)
.Where(r => r.Level >= 0)
.Where(r => r.Level > 0)
.Count();
return count;