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

Merge branch 'master' into feature/files-refactoring

Browse Source 
# Conflicts:
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
This commit is contained in:
pavelbannov 2020-03-25 17:07:48 +03:00
commit bac73b4762
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
View File

@ -408,7 +408,7 @@ namespace ASC.Files.Core.Data
FilesDbContext.Tree.RemoveRange(treeToDelete);
var linkToDelete = Query(FilesDbContext.TagLink)
.Where(r => subfolders.Any(a => r.EntryId == a.ToString()))
.Where(r => subfolders.Any(a => r.EntryId == a))
.Where(r => r.EntryType == FileEntryType.Folder);
FilesDbContext.TagLink.RemoveRange(linkToDelete);
@ -418,7 +418,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 => subfolders.Any(a => r.EntryId == a))
.Where(r => r.EntryType == FileEntryType.Folder);
FilesDbContext.Security.RemoveRange(securityToDelete);
@ -678,7 +678,7 @@ namespace ASC.Files.Core.Data
var parentIdString = parentId.ToString();
var count = FilesDbContext.Tree
.Where(r => r.ParentId == parentId)
.Where(r => r.Level >= 0)
.Where(r => r.Level > 0)
.Count();
return count;