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

fix Bug 52860

Browse Source
This commit is contained in:
pavelbannov 2021-10-03 23:54:37 +03:00
parent 376a4feda5
commit 22782982ba
10 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
View File

@ -100,7 +100,7 @@ namespace ASC.Files.Core
/// <param name="searchText"></param>
/// <param name="searchInContent"></param>
/// <returns></returns>
List<File<T>> GetFilesFiltered(IEnumerable<T> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent);
List<File<T>> GetFilesFiltered(IEnumerable<T> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent, bool checkShared = false);
/// <summary>
///

4
products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
View File

@ -187,7 +187,7 @@ namespace ASC.Files.Core.Data
return FromQueryWithShared(query).Select(ToFile).ToList();
}
public List<File<int>> GetFilesFiltered(IEnumerable<int> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
public List<File<int>> GetFilesFiltered(IEnumerable<int> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent, bool checkShared = false)
{
if (fileIds == null || !fileIds.Any() || filterType == FilterType.FoldersOnly) return new List<File<int>>();
@ -238,7 +238,7 @@ namespace ASC.Files.Core.Data
break;
}
return FromQuery(query).Select(ToFile).ToList();
return (checkShared ? FromQueryWithShared(query) : FromQuery(query)).Select(ToFile).ToList();
}

2
products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs vendored
View File

@ -115,7 +115,7 @@ namespace ASC.Files.Thirdparty.Box
return fileIds.Select(GetBoxFile).Select(ToFile).ToList();
}
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent, bool checkShared = false)
{
if (fileIds == null || !fileIds.Any() || filterType == FilterType.FoldersOnly) return new List<File<string>>();

2
products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs vendored
View File

@ -119,7 +119,7 @@ namespace ASC.Files.Thirdparty.Dropbox
return fileIds.Select(GetDropboxFile).Select(ToFile).ToList();
}
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent, bool checkShared = false)
{
if (fileIds == null || !fileIds.Any() || filterType == FilterType.FoldersOnly) return new List<File<string>>();

2
products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs vendored
View File

@ -116,7 +116,7 @@ namespace ASC.Files.Thirdparty.GoogleDrive
return fileIds.Select(GetDriveEntry).Select(ToFile).ToList();
}
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent, bool checkShared = false)
{
if (fileIds == null || !fileIds.Any() || filterType == FilterType.FoldersOnly) return new List<File<string>>();

2
products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs vendored
View File

@ -115,7 +115,7 @@ namespace ASC.Files.Thirdparty.OneDrive
return fileIds.Select(GetOneDriveItem).Select(ToFile).ToList();
}
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent, bool checkShared = false)
{
if (fileIds == null || !fileIds.Any() || filterType == FilterType.FoldersOnly) return new List<File<string>>();

2
products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs vendored
View File

@ -148,7 +148,7 @@ namespace ASC.Files.Thirdparty.ProviderDao
return result.ToList();
}
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent, bool checkShared = false)
{
var result = Enumerable.Empty<File<string>>();

2
products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs vendored
View File

@ -107,7 +107,7 @@ namespace ASC.Files.Thirdparty.SharePoint
return fileIds.Select(fileId => ProviderInfo.ToFile(ProviderInfo.GetFileById(fileId))).ToList();
}
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent, bool checkShared = false)
{
if (fileIds == null || !fileIds.Any() || filterType == FilterType.FoldersOnly) return new List<File<string>>();

2
products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs vendored
View File

@ -115,7 +115,7 @@ namespace ASC.Files.Thirdparty.Sharpbox
return fileIds.Select(fileId => ToFile(GetFileById(fileId))).ToList();
}
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent, bool checkShared = false)
{
if (fileIds == null || !fileIds.Any() || filterType == FilterType.FoldersOnly) return new List<File<string>>();

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

@ -239,8 +239,8 @@ namespace ASC.Web.Files.Utils
[Scope]
public class EntryManager
{
private const string UPDATE_LIST = "filesUpdateList";
private const string UPDATE_LIST = "filesUpdateList";
private ICache Cache { get; set; }
private FileTrackerHelper FileTracker { get; }
private EntryStatusManager EntryStatusManager { get; }
@ -291,7 +291,7 @@ namespace ASC.Web.Files.Utils
BreadCrumbsManager breadCrumbsManager,
TenantManager tenantManager,
SettingsManager settingsManager,
IServiceProvider serviceProvider,
IServiceProvider serviceProvider,
ICache cache,
FileTrackerHelper fileTracker,
EntryStatusManager entryStatusManager)
@ -464,7 +464,7 @@ namespace ASC.Web.Files.Utils
entries = entries.Concat(folders);
entries = entries.Concat(files);
CalculateTotal();
}
else if (parent.FolderType == FolderType.Templates)
@ -616,7 +616,7 @@ namespace ASC.Web.Files.Utils
var fileIds = tags.Where(tag => tag.EntryType == FileEntryType.File).ToList();
List<FileEntry> files = GetRecentByIds(fileIds.Where(r => r.EntryId is int).Select(r=> (int)r.EntryId), filter, subjectGroup, subjectId, searchText, searchInContent).ToList();
List<FileEntry> files = GetRecentByIds(fileIds.Where(r => r.EntryId is int).Select(r => (int)r.EntryId), filter, subjectGroup, subjectId, searchText, searchInContent).ToList();
files.AddRange(GetRecentByIds(fileIds.Where(r => r.EntryId is string).Select(r => (string)r.EntryId), filter, subjectGroup, subjectId, searchText, searchInContent));
var listFileIds = fileIds.Select(tag => tag.EntryId).ToList();
@ -642,7 +642,7 @@ namespace ASC.Web.Files.Utils
{
var folderDao = DaoFactory.GetFolderDao<T>();
var fileDao = DaoFactory.GetFileDao<T>();
var files = fileDao.GetFilesFiltered(fileIds, filter, subjectGroup, subjectId, searchText, searchInContent);
var files = fileDao.GetFilesFiltered(fileIds, filter, subjectGroup, subjectId, searchText, searchInContent, true);
files = files.Where(file => file.RootFolderType != FolderType.TRASH).ToList();
files = FileSecurity.FilterRead(files).ToList();