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

fix 55063

Browse Source
This commit is contained in:
pavelbannov 2022-02-15 11:01:27 +03:00
parent 0ef8f00fb3
commit 12243c7cc8
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
products/ASC.Files/Core/Configuration/FilesSettings.cs
View File

@ -25,12 +25,14 @@
using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
using ASC.Common;
using ASC.Core;
using ASC.Core.Common.Settings;
using ASC.Files.Core;
using ASC.Web.Core.Files;
using ASC.Web.Studio.Core;
namespace ASC.Web.Files.Classes
@ -117,14 +119,51 @@ namespace ASC.Web.Files.Classes
private SettingsManager SettingsManager { get; }
private CoreBaseSettings CoreBaseSettings { get; }
private SetupInfo SetupInfo { get; }
private FileUtility FileUtility { get; }
private FilesLinkUtility FilesLinkUtility { get; }
public FilesSettingsHelper(SettingsManager settingsManager, CoreBaseSettings coreBaseSettings, SetupInfo setupInfo)
public FilesSettingsHelper(SettingsManager settingsManager, CoreBaseSettings coreBaseSettings, SetupInfo setupInfo, FileUtility fileUtility, FilesLinkUtility filesLinkUtility)
{
SettingsManager = settingsManager;
CoreBaseSettings = coreBaseSettings;
SetupInfo = setupInfo;
}
FileUtility = fileUtility;
FilesLinkUtility = filesLinkUtility;
}
public List<string> ExtsImagePreviewed => FileUtility.ExtsImagePreviewed;
public List<string> ExtsMediaPreviewed => FileUtility.ExtsMediaPreviewed;
public List<string> ExtsWebPreviewed => FileUtility.ExtsWebPreviewed;
public List<string> ExtsWebEdited => FileUtility.ExtsWebEdited;
public List<string> ExtsWebEncrypt => FileUtility.ExtsWebEncrypt;
public List<string> ExtsWebReviewed => FileUtility.ExtsWebReviewed;
public List<string> ExtsWebCustomFilterEditing => FileUtility.ExtsWebCustomFilterEditing;
public List<string> ExtsWebRestrictedEditing => FileUtility.ExtsWebRestrictedEditing;
public List<string> ExtsWebCommented => FileUtility.ExtsWebCommented;
public List<string> ExtsWebTemplate => FileUtility.ExtsWebTemplate;
public List<string> ExtsCoAuthoring => FileUtility.ExtsCoAuthoring;
public List<string> ExtsMustConvert => FileUtility.ExtsMustConvert;
public Dictionary<string, List<string>> ExtsConvertible => FileUtility.ExtsConvertible;
public List<string> ExtsUploadable => FileUtility.ExtsUploadable;
public List<string> ExtsArchive => FileUtility.ExtsArchive;
public List<string> ExtsVideo => FileUtility.ExtsVideo;
public List<string> ExtsAudio => FileUtility.ExtsAudio;
public List<string> ExtsImage => FileUtility.ExtsImage;
public List<string> ExtsSpreadsheet => FileUtility.ExtsSpreadsheet;
public List<string> ExtsPresentation => FileUtility.ExtsPresentation;
public List<string> ExtsDocument => FileUtility.ExtsDocument;
public Dictionary<FileType, string> InternalFormats => FileUtility.InternalExtension;
public string MasterFormExtension => FileUtility.MasterFormExtension;
public string ParamVersion => FilesLinkUtility.Version;
public string ParamOutType => FilesLinkUtility.OutType;
public string FileDownloadUrlString => FilesLinkUtility.FileDownloadUrlString;
public string FileWebViewerUrlString => FilesLinkUtility.FileWebViewerUrlString;
public string FileWebViewerExternalUrlString => FilesLinkUtility.FileWebViewerExternalUrlString;
public string FileWebEditorUrlString => FilesLinkUtility.FileWebEditorUrlString;
public string FileWebEditorExternalUrlString => FilesLinkUtility.FileWebEditorExternalUrlString;
public string FileRedirectPreviewUrlString => FilesLinkUtility.FileRedirectPreviewUrlString;
public string FileThumbnailUrlString => FilesLinkUtility.FileThumbnailUrlString;
public bool ConfirmDelete
{
set

3
products/ASC.Files/Server/Controllers/FilesController.cs
View File

@ -99,7 +99,6 @@ namespace ASC.Api.Documents
private ProductEntryPoint ProductEntryPoint { get; }
private TenantManager TenantManager { get; }
private FileUtility FileUtility { get; }
private FileConverter FileConverter { get; }
private IServiceProvider ServiceProvider { get; }
/// <summary>
@ -130,7 +129,6 @@ namespace ASC.Api.Documents
TenantManager tenantManager,
FileUtility fileUtility,
ConsumerFactory consumerFactory,
FileConverter fileConverter,
IServiceProvider serviceProvider)
{
FilesControllerHelperString = filesControllerHelperString;
@ -156,7 +154,6 @@ namespace ASC.Api.Documents
ProductEntryPoint = productEntryPoint;
TenantManager = tenantManager;
FileUtility = fileUtility;
FileConverter = fileConverter;
ServiceProvider = serviceProvider;
}