fix Bug 57463
This commit is contained in:
parent
5203feffe7
commit
02b4031ba0
@ -681,7 +681,7 @@ namespace ASC.Data.Storage.S3
|
||||
Key = s3Object.Key
|
||||
};
|
||||
|
||||
var metadata = await client.GetObjectMetadataAsync(request);
|
||||
var metadata = await client.GetObjectMetadataAsync(request);
|
||||
var privateExpireKey = metadata.Metadata["private-expire"];
|
||||
if (string.IsNullOrEmpty(privateExpireKey)) continue;
|
||||
|
||||
@ -805,7 +805,7 @@ namespace ASC.Data.Storage.S3
|
||||
}
|
||||
|
||||
return policyBase64;
|
||||
}
|
||||
}
|
||||
|
||||
public override async Task<string> GetUploadedUrlAsync(string domain, string directoryPath)
|
||||
{
|
||||
@ -1029,7 +1029,7 @@ namespace ASC.Data.Storage.S3
|
||||
path = MakePath(domain, path) + '/';
|
||||
var s30Objects = await GetS3ObjectsByPathAsync(domain, path);
|
||||
if (string.IsNullOrEmpty(_recycleDir) || !recycle) return s30Objects;
|
||||
s30Objects.Concat(await GetS3ObjectsByPathAsync(domain, GetRecyclePath(path)));
|
||||
s30Objects = s30Objects.Concat(await GetS3ObjectsByPathAsync(domain, GetRecyclePath(path)));
|
||||
return s30Objects;
|
||||
}
|
||||
|
||||
|
@ -91,18 +91,18 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
|
||||
{
|
||||
var scopeClass = scope.ServiceProvider.GetService<FileMarkAsReadOperationScope>();
|
||||
var (fileMarker, globalFolder, daoFactory, settingsManager) = scopeClass;
|
||||
var entries = AsyncEnumerable.Empty<FileEntry<T>>();
|
||||
var entries = Enumerable.Empty<FileEntry<T>>();
|
||||
if (Folders.Count > 0)
|
||||
{
|
||||
entries.Concat(FolderDao.GetFoldersAsync(Folders));
|
||||
entries = entries.Concat(await FolderDao.GetFoldersAsync(Folders).ToListAsync());
|
||||
}
|
||||
if (Files.Count > 0)
|
||||
{
|
||||
entries.Concat(FileDao.GetFilesAsync(Files));
|
||||
entries = entries.Concat(await FileDao.GetFilesAsync(Files).ToListAsync());
|
||||
}
|
||||
|
||||
await entries.ForEachAwaitAsync(async x =>
|
||||
{
|
||||
|
||||
foreach (var x in entries)
|
||||
{
|
||||
CancellationToken.ThrowIfCancellationRequested();
|
||||
|
||||
await fileMarker.RemoveMarkAsNewAsync(x, ((IAccount)Thread.CurrentPrincipal.Identity).ID);
|
||||
@ -115,8 +115,8 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
|
||||
{
|
||||
ProcessedFolder(((Folder<T>)x).ID);
|
||||
}
|
||||
ProgressStep();
|
||||
});
|
||||
ProgressStep();
|
||||
}
|
||||
|
||||
var rootIds = new List<int>
|
||||
{
|
||||
|
@ -651,7 +651,7 @@ namespace ASC.Web.Files.Utils
|
||||
var fileIds = tags.Where(tag => tag.EntryType == FileEntryType.File).Select(r => r.EntryId).ToList();
|
||||
|
||||
var files = await GetRecentByIdsAsync(fileIds.OfType<int>(), filter, subjectGroup, subjectId, searchText, searchInContent);
|
||||
files.Concat(await GetRecentByIdsAsync(fileIds.OfType<string>(), filter, subjectGroup, subjectId, searchText, searchInContent));
|
||||
files = files.Concat(await GetRecentByIdsAsync(fileIds.OfType<string>(), filter, subjectGroup, subjectId, searchText, searchInContent));
|
||||
|
||||
var listFileIds = fileIds.Select(tag => tag.ToString()).ToList();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user