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

Files: added area filter value, removed unnecessary

Browse Source
This commit is contained in:
Maksim Chegulov 2022-04-26 02:14:06 +03:00
parent ff87612892
commit 05ce39f359
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
products/ASC.Files/Core/Utils/EntryManager.cs
View File

@ -338,7 +338,8 @@ public class EntryManager
_global = global; _global = global;
} }
public async Task<(IEnumerable<FileEntry> Entries, int Total)> GetEntriesAsync<T>(Folder<T> parent, int from, int count, FilterType filter, bool subjectGroup, Guid subjectId, string searchText, bool searchInContent, bool withSubfolders, OrderBy orderBy) public async Task<(IEnumerable<FileEntry> Entries, int Total)> GetEntriesAsync<T>(Folder<T> parent, int from, int count, FilterType filter, bool subjectGroup, Guid subjectId, string searchText, bool searchInContent, bool withSubfolders, OrderBy orderBy,
SearchArea searchArea = SearchArea.Active)
{ {
int total = 0; int total = 0;
@ -515,26 +516,10 @@ public class EntryManager
} }
else if (parent.FolderType == FolderType.VirtualRooms) else if (parent.FolderType == FolderType.VirtualRooms)
{ {
entries = await fileSecurity.GetVirtualRoomsAsync(parent.Id, filter, searchText, searchInContent, orderBy); entries = await fileSecurity.GetVirtualRoomsAsync(filter, subjectId, searchText, searchInContent, withSubfolders, orderBy, searchArea);
CalculateTotal(); CalculateTotal();
} }
else if (parent.FolderType != FolderType.Archive)
{
if (_global.IsAdministrator)
{
var folderDao = _daoFactory.GetFolderDao<T>();
var thirdPartyFolderDao = _daoFactory.GetFolderDao<string>();
var folders = await folderDao.GetFoldersAsync(parent.Id, orderBy, filter, subjectGroup, subjectId, searchText, withSubfolders).ToListAsync();
entries = entries.Concat(folders);
}
else
{
entries = await fileSecurity.GetArchiveAsync(parent.Id, filter, searchText, orderBy);
}
}
else else
{ {
if (parent.FolderType == FolderType.TRASH) if (parent.FolderType == FolderType.TRASH)