Files: fix after merge
This commit is contained in:
parent
bedfad1ec5
commit
9d43cb07ba
@ -22,6 +22,7 @@ using ASC.Common;
|
||||
using ASC.Common.Caching;
|
||||
using ASC.Core;
|
||||
using ASC.Core.Common.EF;
|
||||
using ASC.Core.Common.EF.Context;
|
||||
using ASC.Core.Common.Settings;
|
||||
using ASC.Core.Tenants;
|
||||
using ASC.Files.Core.EF;
|
||||
@ -34,11 +35,12 @@ namespace ASC.Files.Core.Data
|
||||
[Scope]
|
||||
internal class LinkDao : AbstractDao, ILinkDao
|
||||
{
|
||||
public DbContextManager<FilesDbContext> DbContextManager { get; }
|
||||
public DbContextManager<EF.FilesDbContext> DbContextManager { get; }
|
||||
|
||||
public LinkDao(
|
||||
UserManager userManager,
|
||||
DbContextManager<FilesDbContext> dbContextManager,
|
||||
DbContextManager<EF.FilesDbContext> dbContextManager,
|
||||
DbContextManager<TenantDbContext> dbContextManager1,
|
||||
TenantManager tenantManager,
|
||||
TenantUtil tenantUtil,
|
||||
SetupInfo setupInfo,
|
||||
@ -52,6 +54,7 @@ namespace ASC.Files.Core.Data
|
||||
ICache cache)
|
||||
: base(
|
||||
dbContextManager,
|
||||
dbContextManager1,
|
||||
userManager,
|
||||
tenantManager,
|
||||
tenantUtil,
|
||||
|
@ -27,7 +27,7 @@ namespace ASC.Files.Core.EF
|
||||
{
|
||||
modelBuilder
|
||||
.Add(MySqlAddDbFilesLink, Provider.MySql)
|
||||
.Add(PgSqlAddDbFilesLink, Provider.Postgre);
|
||||
.Add(PgSqlAddDbFilesLink, Provider.PostgreSql);
|
||||
return modelBuilder;
|
||||
}
|
||||
public static void MySqlAddDbFilesLink(this ModelBuilder modelBuilder)
|
||||
|
@ -138,6 +138,12 @@ namespace ASC.Web.Core.Files
|
||||
get => extsCoAuthoring ??= (Configuration.GetSection("files:docservice:coauthor-docs").Get<string[]>() ?? new string[] { }).ToList();
|
||||
}
|
||||
|
||||
private string masterFormExtension;
|
||||
public string MasterFormExtension
|
||||
{
|
||||
get => masterFormExtension ??= Configuration["files:docservice:internal-form"] ?? ".docxf";
|
||||
}
|
||||
|
||||
public Dictionary<FileType, string> InternalExtension
|
||||
{
|
||||
get => new Dictionary<FileType, string>
|
||||
@ -553,7 +559,7 @@ namespace ASC.Web.Core.Files
|
||||
};
|
||||
public Dictionary<FileType, string> InternalExtension => FileUtilityConfiguration.InternalExtension;
|
||||
|
||||
public string MasterFormExtension { get => Configuration["files:docservice:internal-form"] ?? ".docxf"; }
|
||||
public string MasterFormExtension { get => FileUtilityConfiguration.MasterFormExtension; }
|
||||
public enum CsvDelimiter
|
||||
{
|
||||
None = 0,
|
||||
|
Loading…
Reference in New Issue
Block a user