From 2936cb4ca232f46f7c7b9e23472e9c6ad1e96ec8 Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Thu, 11 Aug 2022 16:44:08 +0300 Subject: [PATCH] Files: fix --- products/ASC.Files/Core/Utils/EntryManager.cs | 4 +--- products/ASC.Files/Core/Utils/FileMarker.cs | 12 ++++-------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/products/ASC.Files/Core/Utils/EntryManager.cs b/products/ASC.Files/Core/Utils/EntryManager.cs index 07c2a9b53f..a4450bac4d 100644 --- a/products/ASC.Files/Core/Utils/EntryManager.cs +++ b/products/ASC.Files/Core/Utils/EntryManager.cs @@ -119,9 +119,7 @@ public class BreadCrumbsManager return new List(); } - var tmpBreadCrumbs = await _fileSecurity.FilterReadAsync(folderDao.GetParentFoldersAsync(folderId)).ToListAsync(); - var breadCrumbs = tmpBreadCrumbs.Cast().ToList(); - + var breadCrumbs = await _fileSecurity.FilterReadAsync(folderDao.GetParentFoldersAsync(folderId)).Cast().ToListAsync(); var firstVisible = breadCrumbs.ElementAtOrDefault(0) as Folder; var rootId = 0; diff --git a/products/ASC.Files/Core/Utils/FileMarker.cs b/products/ASC.Files/Core/Utils/FileMarker.cs index eb225118ab..c60ca81561 100644 --- a/products/ASC.Files/Core/Utils/FileMarker.cs +++ b/products/ASC.Files/Core/Utils/FileMarker.cs @@ -121,8 +121,7 @@ public class FileMarker parentFolderId = ((Folder)obj.FileEntry).Id; } - var parentFolders = await folderDao.GetParentFoldersAsync(parentFolderId).ToListAsync(); - parentFolders.Reverse(); + var parentFolders = await folderDao.GetParentFoldersAsync(parentFolderId).Reverse().ToListAsync(); var userIDs = obj.UserIDs; @@ -454,8 +453,7 @@ public class FileMarker removeTags.AddRange(listTags); } - var parentFolders = await folderDao.GetParentFoldersAsync(folderID).ToListAsync(); - parentFolders.Reverse(); + var parentFolders = await folderDao.GetParentFoldersAsync(folderID).Reverse().ToListAsync(); var rootFolder = parentFolders.LastOrDefault(); int rootFolderId = default; @@ -788,8 +786,7 @@ public class FileMarker } var cacheFolderId = parent.Id; - var parentsList = await _daoFactory.GetFolderDao().GetParentFoldersAsync(parent.Id).ToListAsync(); - parentsList.Reverse(); + var parentsList = await _daoFactory.GetFolderDao().GetParentFoldersAsync(parent.Id).Reverse().ToListAsync(); parentsList.Remove(parent); if (parentsList.Count > 0) @@ -928,8 +925,7 @@ public class FileMarker } var cacheFolderId = parent.Id; - var parentsList = await _daoFactory.GetFolderDao().GetParentFoldersAsync(parent.Id).ToListAsync(); - parentsList.Reverse(); + var parentsList = await _daoFactory.GetFolderDao().GetParentFoldersAsync(parent.Id).Reverse().ToListAsync(); parentsList.Remove(parent); if (parentsList.Count > 0)