diff --git a/products/ASC.Files/Core/HttpHandlers/SearchHandler.cs b/products/ASC.Files/Core/HttpHandlers/SearchHandler.cs index 94f918e5db..1ab9bc3b70 100644 --- a/products/ASC.Files/Core/HttpHandlers/SearchHandler.cs +++ b/products/ASC.Files/Core/HttpHandlers/SearchHandler.cs @@ -155,7 +155,7 @@ namespace ASC.Web.Files.Configuration { Name = f.Title ?? string.Empty, Description = string.Empty, - URL = PathProvider.GetFolderUrl(f), + URL = PathProvider.GetFolderUrl(f.ID), Date = f.ModifiedOn, Additional = new Dictionary { diff --git a/products/ASC.Files/Core/Services/DocumentService/Configuration.cs b/products/ASC.Files/Core/Services/DocumentService/Configuration.cs index 231069778e..9ec6dc1314 100644 --- a/products/ASC.Files/Core/Services/DocumentService/Configuration.cs +++ b/products/ASC.Files/Core/Services/DocumentService/Configuration.cs @@ -654,7 +654,7 @@ namespace ASC.Web.Files.Services.DocumentService return new GobackConfig { - Url = PathProvider.GetFolderUrl(parent), + Url = PathProvider.GetFolderUrl(parent.ID), }; } catch (Exception) diff --git a/products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs b/products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs index 40556a32f5..761b311029 100644 --- a/products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs +++ b/products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs @@ -31,7 +31,6 @@ using System.Globalization; using ASC.Common; using ASC.Core; using ASC.Core.Common; -using ASC.Files.Core; using ASC.Files.Core.Data; using ASC.Files.Core.Resources; using ASC.Files.Core.Security; @@ -50,8 +49,8 @@ namespace ASC.Files.Core.Services.NotifyService public NotifyClient(IServiceProvider serviceProvider) { ServiceProvider = serviceProvider; - } - + } + public void SendDocuSignComplete(File file, string sourceTitle) { using var scope = ServiceProvider.CreateScope(); @@ -114,7 +113,7 @@ namespace ASC.Files.Core.Services.NotifyService using var scope = ServiceProvider.CreateScope(); var scopeClass = scope.ServiceProvider.GetService(); - var (notifySource, _, filesLinkUtility, fileUtility, baseCommonLinkUtility, daoFactory, pathProvider, userManager, tenantManager) = scopeClass; + var (notifySource, _, filesLinkUtility, fileUtility, baseCommonLinkUtility, daoFactory, pathProvider, userManager, tenantManager) = scopeClass; var client = WorkContext.NotifyContext.NotifyService.RegisterClient(notifySource, scope); var folderDao = daoFactory.GetFolderDao(); @@ -122,7 +121,7 @@ namespace ASC.Files.Core.Services.NotifyService var url = fileEntry.FileEntryType == FileEntryType.File ? filesLinkUtility.GetFileWebPreviewUrl(fileUtility, fileEntry.Title, fileEntry.ID) - : pathProvider.GetFolderUrl(((Folder)fileEntry)); + : pathProvider.GetFolderUrl(fileEntry.ID); var recipientsProvider = notifySource.GetRecipientsProvider(); @@ -156,7 +155,7 @@ namespace ASC.Files.Core.Services.NotifyService using var scope = ServiceProvider.CreateScope(); var scopeClass = scope.ServiceProvider.GetService(); - var (notifySource, _, _, _, baseCommonLinkUtility, _, _, userManager, _) = scopeClass; + var (notifySource, _, _, _, baseCommonLinkUtility, _, _, userManager, _) = scopeClass; var client = WorkContext.NotifyContext.NotifyService.RegisterClient(notifySource, scope); var recipientsProvider = notifySource.GetRecipientsProvider(); @@ -232,15 +231,15 @@ namespace ASC.Files.Core.Services.NotifyService TenantManager = tenantManager; } - public void Deconstruct(out NotifySource notifySource, + public void Deconstruct(out NotifySource notifySource, out SecurityContext securityContext, - out FilesLinkUtility filesLinkUtility, - out FileUtility fileUtility, + out FilesLinkUtility filesLinkUtility, + out FileUtility fileUtility, out BaseCommonLinkUtility baseCommonLinkUtility, out IDaoFactory daoFactory, - out PathProvider pathProvider, - out UserManager userManager, - out TenantManager tenantManager ) + out PathProvider pathProvider, + out UserManager userManager, + out TenantManager tenantManager) { notifySource = NotifySource; securityContext = SecurityContext;