Merge pull request #147 from ONLYOFFICE/bugfix/65872

Bugfix/65872
ONLYOFFICE · Jan 15, 2024 · 3ee1dba · 3ee1dba
2 parents 1bb9a4f + defac30
commit 3ee1dba
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/products/ASC.Files/Core/Core/FileStorageService.cs b/products/ASC.Files/Core/Core/FileStorageService.cs
@@ -2616,16 +2616,15 @@ public async Task<string> SetAceObjectAsync<T>(AceCollection<T> aceCollection, b
                         switch (eventType)
                         {
                             case EventType.Create:
-                                await _filesMessageService.SendAsync(MessageAction.RoomCreateUser, entry, user.Id, name, 
+                                await _filesMessageService.SendAsync(MessageAction.RoomCreateUser, entry, user.Id, name,
                                     FileShareExtensions.GetAccessString(ace.Access, true));
                                 break;
                             case EventType.Remove:
-                                await _filesMessageService.SendAsync(MessageAction.RoomRemoveUser, entry, user.Id, name, 
+                                await _filesMessageService.SendAsync(MessageAction.RoomRemoveUser, entry, user.Id, name,
                                     FileShareExtensions.GetAccessString(ace.Access, true));
                                 break;
                             case EventType.Update:
-                                await _filesMessageService.SendAsync(MessageAction.RoomUpdateAccessForUser, entry, user.Id, name,
-                                    FileShareExtensions.GetAccessString(ace.Access, true));
+                                await _filesMessageService.SendAsync(MessageAction.RoomUpdateAccessForUser, entry, user.Id, ace.Access, true, name);
                                 break;
                         }
                     }

diff --git a/products/ASC.Files/Core/Helpers/FilesMessageService.cs b/products/ASC.Files/Core/Helpers/FilesMessageService.cs
@@ -83,9 +83,9 @@ public async Task SendAsync<T>(MessageAction action, FileEntry<T> entry, Guid us
         await SendAsync(action, entry, null, userId, FileShare.None, description);
     }
 
-    public async Task SendAsync<T>(MessageAction action, FileEntry<T> entry, Guid userId, FileShare userRole, params string[] description)
+    public async Task SendAsync<T>(MessageAction action, FileEntry<T> entry, Guid userId, FileShare userRole, bool useRoomFormat = false, params string[] description)
     {
-        description = description.Append(FileShareExtensions.GetAccessString(userRole)).ToArray();
+        description = description.Append(FileShareExtensions.GetAccessString(userRole, useRoomFormat)).ToArray();
         await SendAsync(action, entry, null, userId, userRole, description);
     }