From 8d0324ee2a0658abef1b29ad9fb8e9c7e7209da7 Mon Sep 17 00:00:00 2001 From: SuhorukovAnton Date: Fri, 21 Jan 2022 16:59:17 +0300 Subject: [PATCH] analizators/s2326 --- common/ASC.Core.Common/EF/Context/DbContextManager.cs | 2 +- products/ASC.Files/Core/Core/FileStorageService.cs | 4 ++-- products/ASC.Files/Core/HttpHandlers/SearchHandler.cs | 6 +++--- products/ASC.Files/Core/Utils/EntryManager.cs | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/ASC.Core.Common/EF/Context/DbContextManager.cs b/common/ASC.Core.Common/EF/Context/DbContextManager.cs index 690367553b1..e3252aacc14 100644 --- a/common/ASC.Core.Common/EF/Context/DbContextManager.cs +++ b/common/ASC.Core.Common/EF/Context/DbContextManager.cs @@ -88,7 +88,7 @@ public MultiRegionalDbContextManager(IOptionsFactory> public static class DbContextManagerExtension { - public static DIHelper AddDbContextManagerService(this DIHelper services) where T : BaseDbContext, new() + public static DIHelper AddDbContextManagerService(this DIHelper services) { //TODO //services.TryAddScoped>(); diff --git a/products/ASC.Files/Core/Core/FileStorageService.cs b/products/ASC.Files/Core/Core/FileStorageService.cs index 1aef4898eb3..be27708c0cf 100644 --- a/products/ASC.Files/Core/Core/FileStorageService.cs +++ b/products/ASC.Files/Core/Core/FileStorageService.cs @@ -1214,7 +1214,7 @@ public List GetThirdPartyFolder(int folderType = 0) var folders = providersInfo.Select(providerInfo => { - var folder = EntryManager.GetFakeThirdpartyFolder(providerInfo); + var folder = EntryManager.GetFakeThirdpartyFolder(providerInfo); folder.NewForMe = folder.RootFolderType == FolderType.COMMON ? 1 : 0; return folder; }); @@ -1309,7 +1309,7 @@ public object DeleteThirdParty(string providerId) var curProviderId = Convert.ToInt32(providerId); var providerInfo = providerDao.GetProviderInfo(curProviderId); - var folder = EntryManager.GetFakeThirdpartyFolder(providerInfo); + var folder = EntryManager.GetFakeThirdpartyFolder(providerInfo); ErrorIf(!FileSecurity.CanDelete(folder), FilesCommonResource.ErrorMassage_SecurityException_DeleteFolder); if (providerInfo.RootFolderType == FolderType.COMMON) diff --git a/products/ASC.Files/Core/HttpHandlers/SearchHandler.cs b/products/ASC.Files/Core/HttpHandlers/SearchHandler.cs index b14d6a41cda..7ff59c49aa9 100644 --- a/products/ASC.Files/Core/HttpHandlers/SearchHandler.cs +++ b/products/ASC.Files/Core/HttpHandlers/SearchHandler.cs @@ -143,7 +143,7 @@ public SearchResultItem[] Search(string text) Additional = new Dictionary { { "Author", file.CreateByString.HtmlEncode() }, - { "Path", FolderPathBuilder(EntryManager.GetBreadCrumbs(file.FolderID, folderDao)) }, + { "Path", FolderPathBuilder(EntryManager.GetBreadCrumbs(file.FolderID, folderDao)) }, { "Size", FileSizeComment.FilesSizeToString(file.ContentLength) } } }; @@ -162,7 +162,7 @@ public SearchResultItem[] Search(string text) Additional = new Dictionary { { "Author", folder.CreateByString.HtmlEncode() }, - { "Path", FolderPathBuilder(EntryManager.GetBreadCrumbs(folder.ID, folderDao)) }, + { "Path", FolderPathBuilder(EntryManager.GetBreadCrumbs(folder.ID, folderDao)) }, { "IsFolder", true } } }; @@ -172,7 +172,7 @@ public SearchResultItem[] Search(string text) return list.ToArray(); } - private static string FolderPathBuilder(IEnumerable folders) + private static string FolderPathBuilder(IEnumerable folders) { var titles = folders.Select(f => f.Title).ToList(); const string separator = " \\ "; diff --git a/products/ASC.Files/Core/Utils/EntryManager.cs b/products/ASC.Files/Core/Utils/EntryManager.cs index ed90fd22be1..50ca9904fa7 100644 --- a/products/ASC.Files/Core/Utils/EntryManager.cs +++ b/products/ASC.Files/Core/Utils/EntryManager.cs @@ -589,7 +589,7 @@ public IEnumerable> GetThirpartyFolders(Folder parent, stri var providers = providerDao.GetProvidersInfo(parent.RootFolderType, searchText); folderList = providers - .Select(providerInfo => GetFakeThirdpartyFolder(providerInfo, parent.ID.ToString())) + .Select(providerInfo => GetFakeThirdpartyFolder(providerInfo, parent.ID.ToString())) .Where(r => fileSecurity.CanRead(r)).ToList(); if (folderList.Count > 0) @@ -829,7 +829,7 @@ public IEnumerable SortEntries(IEnumerable entries, Ord return result; } - public Folder GetFakeThirdpartyFolder(IProviderInfo providerInfo, string parentFolderId = null) + public Folder GetFakeThirdpartyFolder(IProviderInfo providerInfo, string parentFolderId = null) { //Fake folder. Don't send request to third party var folder = ServiceProvider.GetService>();