Files: fix after merge

ONLYOFFICE · Dec 28, 2021 · 9d43cb0 · 9d43cb0
1 parent bedfad1
commit 9d43cb0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/LinkDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/LinkDao.cs
@@ -22,6 +22,7 @@
 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 @@ internal class LinkDao : AbstractDao, ILinkDao
             ICache cache)
             : base(
                   dbContextManager,
+                  dbContextManager1,
                   userManager,
                   tenantManager,
                   tenantUtil,

diff --git a/products/ASC.Files/Core/Core/EF/DbFilesLink.cs b/products/ASC.Files/Core/Core/EF/DbFilesLink.cs
@@ -27,7 +27,7 @@ public static ModelBuilderWrapper AddDbFilesLink(this ModelBuilderWrapper modelB
         {
             modelBuilder
                 .Add(MySqlAddDbFilesLink, Provider.MySql)
-                .Add(PgSqlAddDbFilesLink, Provider.Postgre);
+                .Add(PgSqlAddDbFilesLink, Provider.PostgreSql);
             return modelBuilder;
         }
         public static void MySqlAddDbFilesLink(this ModelBuilder modelBuilder)

diff --git a/web/ASC.Web.Core/Files/FileUtility.cs b/web/ASC.Web.Core/Files/FileUtility.cs
@@ -138,6 +138,12 @@ public List<string> ExtsCoAuthoring
             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 @@ public List<string> ExtsCoAuthoring
             };
         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,