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

Merge branch 'develop' into feature/virtual-rooms-1.2

Browse Source
This commit is contained in:
Alexey Safronov 2022-03-23 17:59:05 +03:00
commit ff54e42a27
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
View File

@ -144,7 +144,6 @@ namespace ASC.Web.Files
PathProvider pathProvider,
UserManager userManager,
DocumentServiceTrackerHelper documentServiceTrackerHelper,
DocumentServiceHelper documentServiceHelper,
FilesMessageService filesMessageService,
FileShareLink fileShareLink,
FileConverter fileConverter,
@ -1225,8 +1224,7 @@ namespace ASC.Web.Files
var fileDao = DaoFactory.GetFileDao<T>();
var httpClient = ClientFactory.CreateClient();
using var response = await httpClient.SendAsync(request);
using var secondResponse = await httpClient.SendAsync(request);
var fileStream = await secondResponse.Content.ReadAsStreamAsync();
using var fileStream = await response.Content.ReadAsStreamAsync();
if (fileStream.CanSeek)
{

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

@ -639,15 +639,14 @@ namespace ASC.Web.Files.Utils
var tagDao = DaoFactory.GetTagDao<int>();
var tags = await tagDao.GetTagsAsync(AuthContext.CurrentAccount.ID, TagType.Recent).ToListAsync();
var fileIds = tags.Where(tag => tag.EntryType == FileEntryType.File).ToList();
var fileIds = tags.Where(tag => tag.EntryType == FileEntryType.File).Select(r => r.EntryId).ToList();
var filesEnum = await GetRecentByIdsAsync(fileIds.Where(r => r.EntryId is int).Select(r => (int)r.EntryId), filter, subjectGroup, subjectId, searchText, searchInContent);
List<FileEntry> files = filesEnum.ToList();
files.AddRange(await GetRecentByIdsAsync(fileIds.Where(r => r.EntryId is string).Select(r => (string)r.EntryId), filter, subjectGroup, subjectId, searchText, searchInContent));
var files = await GetRecentByIdsAsync(fileIds.OfType<int>(), filter, subjectGroup, subjectId, searchText, searchInContent);
files.Concat(await GetRecentByIdsAsync(fileIds.OfType<string>(), filter, subjectGroup, subjectId, searchText, searchInContent));
var listFileIds = fileIds.Select(tag => tag.EntryId).ToList();
var listFileIds = fileIds.Select(tag => tag.ToString()).ToList();
files = files.OrderBy(file =>
return files.OrderBy(file =>
{
var fileId = "";
if (file is File<int> fileInt)
@ -659,11 +658,9 @@ namespace ASC.Web.Files.Utils
fileId = fileString.ID;
}
return listFileIds.IndexOf(fileId);
return listFileIds.IndexOf(fileId.ToString());
}).ToList();
return files;
async Task<IEnumerable<FileEntry>> GetRecentByIdsAsync<T>(IEnumerable<T> fileIds, FilterType filter, bool subjectGroup, Guid subjectId, string searchText, bool searchInContent)
{
var folderDao = DaoFactory.GetFolderDao<T>();