Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
This commit is contained in:
commit
2273887a6a
@ -674,7 +674,7 @@ namespace ASC.Web.Files.Utils
|
|||||||
{
|
{
|
||||||
var folderDao = DaoFactory.GetFolderDao<T>();
|
var folderDao = DaoFactory.GetFolderDao<T>();
|
||||||
var fileDao = DaoFactory.GetFileDao<T>();
|
var fileDao = DaoFactory.GetFileDao<T>();
|
||||||
var files = await fileDao.GetFilesFilteredAsync(fileIds, filter, subjectGroup, subjectId, searchText, searchInContent).Where(file => file.RootFolderType != FolderType.TRASH).ToListAsync();
|
var files = await fileDao.GetFilesFilteredAsync(fileIds, filter, subjectGroup, subjectId, searchText, searchInContent, true).Where(file => file.RootFolderType != FolderType.TRASH).ToListAsync();
|
||||||
|
|
||||||
var tmpFiles = await FileSecurity.FilterReadAsync(files);
|
var tmpFiles = await FileSecurity.FilterReadAsync(files);
|
||||||
files = tmpFiles.ToList();
|
files = tmpFiles.ToList();
|
||||||
|
Loading…
Reference in New Issue
Block a user