IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Files: fix

Browse Source
This commit is contained in:
pavelbannov 2022-08-11 16:44:08 +03:00
parent e54617c275
commit 2936cb4ca2
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
products/ASC.Files/Core/Utils/EntryManager.cs
View File

@ -119,9 +119,7 @@ public class BreadCrumbsManager
return new List<FileEntry>(); return new List<FileEntry>();
} }
var tmpBreadCrumbs = await _fileSecurity.FilterReadAsync(folderDao.GetParentFoldersAsync(folderId)).ToListAsync(); var breadCrumbs = await _fileSecurity.FilterReadAsync(folderDao.GetParentFoldersAsync(folderId)).Cast<FileEntry>().ToListAsync();
var breadCrumbs = tmpBreadCrumbs.Cast<FileEntry>().ToList();
var firstVisible = breadCrumbs.ElementAtOrDefault(0) as Folder<T>; var firstVisible = breadCrumbs.ElementAtOrDefault(0) as Folder<T>;
var rootId = 0; var rootId = 0;

12
products/ASC.Files/Core/Utils/FileMarker.cs
View File

@ -121,8 +121,7 @@ public class FileMarker
parentFolderId = ((Folder<T>)obj.FileEntry).Id; parentFolderId = ((Folder<T>)obj.FileEntry).Id;
} }
var parentFolders = await folderDao.GetParentFoldersAsync(parentFolderId).ToListAsync(); var parentFolders = await folderDao.GetParentFoldersAsync(parentFolderId).Reverse().ToListAsync();
parentFolders.Reverse();
var userIDs = obj.UserIDs; var userIDs = obj.UserIDs;
@ -454,8 +453,7 @@ public class FileMarker
removeTags.AddRange(listTags); removeTags.AddRange(listTags);
} }
var parentFolders = await folderDao.GetParentFoldersAsync(folderID).ToListAsync(); var parentFolders = await folderDao.GetParentFoldersAsync(folderID).Reverse().ToListAsync();
parentFolders.Reverse();
var rootFolder = parentFolders.LastOrDefault(); var rootFolder = parentFolders.LastOrDefault();
int rootFolderId = default; int rootFolderId = default;
@ -788,8 +786,7 @@ public class FileMarker
} }
var cacheFolderId = parent.Id; var cacheFolderId = parent.Id;
var parentsList = await _daoFactory.GetFolderDao<T>().GetParentFoldersAsync(parent.Id).ToListAsync(); var parentsList = await _daoFactory.GetFolderDao<T>().GetParentFoldersAsync(parent.Id).Reverse().ToListAsync();
parentsList.Reverse();
parentsList.Remove(parent); parentsList.Remove(parent);
if (parentsList.Count > 0) if (parentsList.Count > 0)
@ -928,8 +925,7 @@ public class FileMarker
} }
var cacheFolderId = parent.Id; var cacheFolderId = parent.Id;
var parentsList = await _daoFactory.GetFolderDao<T>().GetParentFoldersAsync(parent.Id).ToListAsync(); var parentsList = await _daoFactory.GetFolderDao<T>().GetParentFoldersAsync(parent.Id).Reverse().ToListAsync();
parentsList.Reverse();
parentsList.Remove(parent); parentsList.Remove(parent);
if (parentsList.Count > 0) if (parentsList.Count > 0)