Skip to content

Commit

Permalink
ASC.Files: links to rooms without filter by subfolders
Browse files Browse the repository at this point in the history
  • Loading branch information
andreysavihin committed Dec 17, 2024
1 parent c5dd296 commit 5bd6d3c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ JsonValueKind.String when int.TryParse(additionalInfo.RoomId.GetString(), out va
}
}

activityInfo.RoomUri = _pathProvider.GetRoomsUrl(roomId.ToString());
activityInfo.RoomUri = _pathProvider.GetRoomsUrl(roomId.ToString(), false);
activityInfo.RoomTitle = additionalInfo.RoomTitle;
activityInfo.RoomOldTitle = additionalInfo.RoomOldTitle;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ public async Task SendEditorMentions<T>(FileEntry<T> file, string documentUrl, L
return;
}

var roomUrl = pathProvider.GetRoomsUrl(roomId);
var roomUrl = pathProvider.GetRoomsUrl(roomId, false);

var room = await folderDao.GetFolderAsync(id);

Expand Down Expand Up @@ -327,7 +327,7 @@ public async Task SendRoomRemovedAsync<T>(FileEntry<T> folder, List<AceWrapper>
var recipientsProvider = notifySource.GetRecipientsProvider();

var folderId = folder.Id.ToString();
var roomUrl = pathProvider.GetRoomsUrl(folderId);
var roomUrl = pathProvider.GetRoomsUrl(folderId, false);

foreach (var ace in aces)
{
Expand Down
2 changes: 1 addition & 1 deletion products/ASC.Files/Core/Utils/FileSharing.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public async Task<AceProcessingResult<T>> SetAceObjectAsync<T>(List<AceWrapper>

var handledAces = new List<ProcessedItem<T>>(aceWrappers.Count);
var room = entry is Folder<T> folder && DocSpaceHelper.IsRoom(folder.FolderType) ? folder : null;
var roomUrl = room != null ? pathProvider.GetRoomsUrl(room.Id.ToString()) : null;
var roomUrl = room != null ? pathProvider.GetRoomsUrl(room.Id.ToString(), false) : null;
var entryType = entry.FileEntryType;
var recipients = new Dictionary<Guid, FileShare>();
var usersWithoutRight = new List<Guid>();
Expand Down

0 comments on commit 5bd6d3c

Please sign in to comment.