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

fixed subfolders method

Browse Source
This commit is contained in:
pavelbannov 2022-07-11 22:22:56 +03:00
parent 477f386047
commit b2b55bfa5b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@ internal class FolderDao : AbstractDao, IFolderDao<int>
private readonly IMapper _mapper; private readonly IMapper _mapper;
private static readonly List<FilterType> _constraintFolderFilters = private static readonly List<FilterType> _constraintFolderFilters =
new List<FilterType> { FilterType.FilesOnly, FilterType.ByExtension, FilterType.DocumentsOnly, FilterType.ImagesOnly, new List<FilterType> { FilterType.FilesOnly, FilterType.ByExtension, FilterType.DocumentsOnly, FilterType.ImagesOnly,
FilterType.PresentationsOnly, FilterType.SpreadsheetsOnly, FilterType.ArchiveOnly, FilterType.MediaOnly }; FilterType.PresentationsOnly, FilterType.SpreadsheetsOnly, FilterType.ArchiveOnly, FilterType.MediaOnly };
public FolderDao( public FolderDao(
@ -350,14 +350,14 @@ internal class FolderDao : AbstractDao, IFolderDao<int>
folderId = await InternalSaveFolderToDbAsync(folder); folderId = await InternalSaveFolderToDbAsync(folder);
await tx.CommitAsync().ConfigureAwait(false); await tx.CommitAsync().ConfigureAwait(false);
}); });
} }
else else
{ {
folderId = await InternalSaveFolderToDbAsync(folder); folderId = await InternalSaveFolderToDbAsync(folder);
} }
//FactoryIndexer.IndexAsync(FoldersWrapper.GetFolderWrapper(ServiceProvider, folder)); //FactoryIndexer.IndexAsync(FoldersWrapper.GetFolderWrapper(ServiceProvider, folder));
return folderId; return folderId;
} }
@ -1365,7 +1365,7 @@ internal class FolderDao : AbstractDao, IFolderDao<int>
private IQueryable<DbFolder> SetFilterByTypes(IQueryable<DbFolder> q, IEnumerable<FilterType> filterTypes) private IQueryable<DbFolder> SetFilterByTypes(IQueryable<DbFolder> q, IEnumerable<FilterType> filterTypes)
{ {
if (filterTypes.Any() && !filterTypes.Contains(FilterType.None)) if (filterTypes.Any() && !filterTypes.Contains(FilterType.None) && !filterTypes.Contains(FilterType.FoldersOnly))
{ {
var filter = filterTypes.Select(f => f switch var filter = filterTypes.Select(f => f switch
{ {