Merge branch 'hotfix/v3.0.1' into develop

ONLYOFFICE · Nov 26, 2024 · 101c818 · 101c818
2 parents 2d899d0 + a0809c7
commit 101c818
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 28 deletions.
diff --git a/common/ASC.Data.Storage/S3/S3Storage.cs b/common/ASC.Data.Storage/S3/S3Storage.cs
@@ -953,7 +953,7 @@ public override async Task DeleteDirectoryAsync(string domain, string path)
     }
     public override async Task DeleteDirectoryAsync(string domain, string path, Guid ownerId)
     {
-        await DeleteFilesAsync(domain, path, "*", true);
+        await DeleteFilesAsync(domain, path, "*", true, ownerId);
     }
 
     public override async Task<long> GetFileSizeAsync(string domain, string path)

diff --git a/common/services/ASC.ElasticSearch/Core/Selector.cs b/common/services/ASC.ElasticSearch/Core/Selector.cs
@@ -118,7 +118,7 @@ public Selector<T> Match(Expression<Func<T, object>> selector, string value)
         {
             _queryContainer &= Wrap(selector, (a, w) => w.MatchPhrase(r => r.Field(a).Query(value.TrimQuotes())));
         }
-        else if (value.HasOtherLetter() || IsExactly(value))
+        else if (IsExactly(value))
         {
             _queryContainer &= Wrap(selector, (a, w) => w.Match(r => r.Field(a).Query(value.TrimQuotes())));
         }
@@ -306,7 +306,7 @@ private void Match(Func<Fields> propsFunc, string value)
         {
             _queryContainer = _queryContainer && MultiPhrase(props, value.TrimQuotes());
         }
-        else if (value.HasOtherLetter() || IsExactly(value))
+        else if (IsExactly(value))
         {
             _queryContainer = _queryContainer && MultiMatch(props, value.TrimQuotes());
         }
@@ -431,12 +431,6 @@ private QueryContainer MultiPhrase(Fields fields, string value)
 
 internal static class StringExtension
 {
-    public static bool HasOtherLetter(this string value)
-    {      
-        var specialChar = @"-=+;/\|№&#^<>()[]{}$%";
-        return specialChar.Any(value.Contains);
-    }
-
     public static string WrapAsterisk(this string value)
     {
         var result = value;

diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
@@ -1559,9 +1559,7 @@ select t.ParentId
                              select rs.Indexing).FirstOrDefault() && f.EntryId == r.Id && f.TenantId == r.TenantId && f.EntryType == FileEntryType.Folder
                          select f.Order
                                 ).FirstOrDefault(),
-                Settings = (from f in filesDbContext.RoomSettings 
-                            where f.TenantId == r.TenantId && f.RoomId == r.Id 
-                            select f).FirstOrDefault()
+                Settings = filesDbContext.RoomSettings.Where(x => x.TenantId == r.TenantId && x.RoomId == r.Id).Distinct().FirstOrDefault()
             });
     }
 
@@ -1599,9 +1597,7 @@ select t.ParentId
                         select rs.Indexing).FirstOrDefault() && f.EntryId == r.Id && f.TenantId == r.TenantId && f.EntryType == FileEntryType.Folder
                     select f.Order
                 ).FirstOrDefault(),
-                Settings = (from f in filesDbContext.RoomSettings 
-                    where f.TenantId == r.TenantId && f.RoomId == r.Id 
-                    select f).FirstOrDefault()
+                Settings = filesDbContext.RoomSettings.Where(x => x.TenantId == r.TenantId && x.RoomId == r.Id).Distinct().FirstOrDefault()
             });
     }
 

diff --git a/products/ASC.Files/Core/Core/EF/Queries/FolderQueries.cs b/products/ASC.Files/Core/Core/EF/Queries/FolderQueries.cs
@@ -407,9 +407,7 @@ select f
                                         .Skip(1)
                                         .FirstOrDefault()
                                         .ToString()),
-                            Settings = (from f in ctx.RoomSettings 
-                                where f.TenantId == r.TenantId && f.RoomId == r.Id 
-                                select f).FirstOrDefault(),
+                            Settings = ctx.RoomSettings.Where(x => x.TenantId == r.TenantId && x.RoomId == r.Id).Distinct().FirstOrDefault(),
                             Order = (
                                 from f in ctx.FileOrder
                                 where (
@@ -484,9 +482,7 @@ select t.ParentId
                                     select rs.Indexing).FirstOrDefault() && f.EntryId == r.folder.Id && f.TenantId == r.folder.TenantId && f.EntryType == FileEntryType.Folder
                                 select f.Order
                             ).FirstOrDefault(),
-                            Settings = (from f in ctx.RoomSettings 
-                                where f.TenantId == r.folder.TenantId && f.RoomId == r.folder.Id 
-                                select f).FirstOrDefault()
+                            Settings = ctx.RoomSettings.Where(x => x.TenantId == r.folder.TenantId && x.RoomId == r.folder.Id).Distinct().FirstOrDefault()
                         }
                     ));
 
@@ -923,10 +919,7 @@ select f
                     .Select(r => new DbFolderQuery
                     {
                         Folder = r.Folders,
-                        Settings = (from f in ctx.RoomSettings
-                                where f.TenantId == r.Folders.TenantId && f.RoomId == r.Folders.Id
-                                select f)
-                            .FirstOrDefault()
+                        Settings = ctx.RoomSettings.Where(x => x.TenantId == r.Folders.TenantId && x.RoomId == r.Folders.Id).Distinct().FirstOrDefault()
                     })
                     .Skip(1)
                     .FirstOrDefault());

diff --git a/products/ASC.Files/Core/Utils/EntryManager.cs b/products/ASC.Files/Core/Utils/EntryManager.cs
@@ -167,8 +167,6 @@ public async Task SetFileStatusAsync<T>(IEnumerable<File<T>> files)
                 file.LockedBy = lockedBy != Guid.Empty && lockedBy != authContext.CurrentAccount.ID
                     ? await global.GetUserNameAsync(lockedBy)
                     : null;
-
-                continue;
             }
 
             if (tagsNew.Exists(r => r.EntryId.Equals(file.Id)))

diff --git a/web/ASC.Web.Core/Users/UserManagerWrapper.cs b/web/ASC.Web.Core/Users/UserManagerWrapper.cs
@@ -139,7 +139,8 @@ public async Task<UserInfo> AddInvitedUserAsync(string email, EmployeeType type,
         {
             await userManager.AddUserIntoGroupAsync(newUser.Id, groupId, true);
         }
-        else if (type == EmployeeType.RoomAdmin)
+
+        if (groupId == Guid.Empty && type == EmployeeType.RoomAdmin || type == EmployeeType.DocSpaceAdmin && user.Status == EmployeeStatus.Pending)
         {
             var (name, value) = await tenantQuotaFeatureStatHelper.GetStatAsync<CountPaidUserFeature, int>();
             _ = quotaSocketManager.ChangeQuotaUsedValueAsync(name, value);