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:
Maksim Chegulov 2022-09-29 18:29:11 +03:00
parent 8b8b213090
commit 3e9470b64c
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
View File

@ -969,7 +969,7 @@ internal class TagDao<T> : AbstractDao, ITagDao<T>
tempTags = tempTags.Concat(_projectsQuery(filesDbContext, tenantId, subject));
}
if (!deepSearch && parentFolder.FolderType != FolderType.VirtualRooms)
if (!deepSearch && parentFolder.RootFolderType != FolderType.VirtualRooms)
{
await foreach (var e in tempTags)
{
@ -1024,6 +1024,7 @@ internal class TagDao<T> : AbstractDao, ITagDao<T>
result = result.Concat(_newTagsForSBoxQuery(filesDbContext, tenantId, subject, thirdpartyFolderIds));
}
}
if (parentFolder.FolderType == FolderType.VirtualRooms)
{
result = result.Concat(_newTagsThirdpartyRoomsQuery(filesDbContext, tenantId, subject));

2
products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs vendored
View File

@ -645,7 +645,7 @@ internal abstract class ThirdPartyProviderDao<T> : ThirdPartyProviderDao, IDispo
var filesDbContext = _dbContextFactory.CreateDbContext();
var entryIDs = await filesDbContext.ThirdpartyIdMapping
.Where(r => r.Id.StartsWith(parentFolder.Id))
.Where(r => r.Id.StartsWith(PathPrefix))
.Select(r => r.HashId)
.ToListAsync();

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

@ -151,7 +151,7 @@ public class FileMarker
userEntriesData.Add(userID, entries);
}
RemoveFromCahce(projectsFolder, userID);
RemoveFromCahce(projectsFolder, userID);
});
}
else
@ -813,6 +813,11 @@ public class FileMarker
parentFolderTag.Id = -1;
}
if (parent.FolderType != FolderType.VirtualRooms && parent.RootFolderType == FolderType.VirtualRooms && parent.ProviderEntry)
{
countSubNew = parentFolderTag.Count;
}
if (parentFolderTag.Count != countSubNew)
{
if (countSubNew > 0)