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

Files: fix after merge

Browse Source
This commit is contained in:
pavelbannov 2021-12-28 18:40:42 +03:00
parent bedfad1ec5
commit 9d43cb07ba
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
products/ASC.Files/Core/Core/Dao/TeamlabDao/LinkDao.cs
View File

@ -22,6 +22,7 @@ using ASC.Common;
using ASC.Common.Caching; using ASC.Common.Caching;
using ASC.Core; using ASC.Core;
using ASC.Core.Common.EF; using ASC.Core.Common.EF;
using ASC.Core.Common.EF.Context;
using ASC.Core.Common.Settings; using ASC.Core.Common.Settings;
using ASC.Core.Tenants; using ASC.Core.Tenants;
using ASC.Files.Core.EF; using ASC.Files.Core.EF;
@ -34,11 +35,12 @@ namespace ASC.Files.Core.Data
[Scope] [Scope]
internal class LinkDao : AbstractDao, ILinkDao internal class LinkDao : AbstractDao, ILinkDao
{ {
public DbContextManager<FilesDbContext> DbContextManager { get; } public DbContextManager<EF.FilesDbContext> DbContextManager { get; }
public LinkDao( public LinkDao(
UserManager userManager, UserManager userManager,
DbContextManager<FilesDbContext> dbContextManager, DbContextManager<EF.FilesDbContext> dbContextManager,
DbContextManager<TenantDbContext> dbContextManager1,
TenantManager tenantManager, TenantManager tenantManager,
TenantUtil tenantUtil, TenantUtil tenantUtil,
SetupInfo setupInfo, SetupInfo setupInfo,
@ -52,6 +54,7 @@ namespace ASC.Files.Core.Data
ICache cache) ICache cache)
: base( : base(
dbContextManager, dbContextManager,
dbContextManager1,
userManager, userManager,
tenantManager, tenantManager,
tenantUtil, tenantUtil,

2
products/ASC.Files/Core/Core/EF/DbFilesLink.cs
View File

@ -27,7 +27,7 @@ namespace ASC.Files.Core.EF
{ {
modelBuilder modelBuilder
.Add(MySqlAddDbFilesLink, Provider.MySql) .Add(MySqlAddDbFilesLink, Provider.MySql)
.Add(PgSqlAddDbFilesLink, Provider.Postgre); .Add(PgSqlAddDbFilesLink, Provider.PostgreSql);
return modelBuilder; return modelBuilder;
} }
public static void MySqlAddDbFilesLink(this ModelBuilder modelBuilder) public static void MySqlAddDbFilesLink(this ModelBuilder modelBuilder)

8
web/ASC.Web.Core/Files/FileUtility.cs
View File

@ -138,6 +138,12 @@ namespace ASC.Web.Core.Files
get => extsCoAuthoring ??= (Configuration.GetSection("files:docservice:coauthor-docs").Get<string[]>() ?? new string[] { }).ToList(); 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 public Dictionary<FileType, string> InternalExtension
{ {
get => new Dictionary<FileType, string> get => new Dictionary<FileType, string>
@ -553,7 +559,7 @@ namespace ASC.Web.Core.Files
}; };
public Dictionary<FileType, string> InternalExtension => FileUtilityConfiguration.InternalExtension; 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 public enum CsvDelimiter
{ {
None = 0, None = 0,