Files: fix
This commit is contained in:
parent
8b8b213090
commit
3e9470b64c
@ -969,7 +969,7 @@ internal class TagDao<T> : AbstractDao, ITagDao<T>
|
|||||||
tempTags = tempTags.Concat(_projectsQuery(filesDbContext, tenantId, subject));
|
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)
|
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));
|
result = result.Concat(_newTagsForSBoxQuery(filesDbContext, tenantId, subject, thirdpartyFolderIds));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (parentFolder.FolderType == FolderType.VirtualRooms)
|
if (parentFolder.FolderType == FolderType.VirtualRooms)
|
||||||
{
|
{
|
||||||
result = result.Concat(_newTagsThirdpartyRoomsQuery(filesDbContext, tenantId, subject));
|
result = result.Concat(_newTagsThirdpartyRoomsQuery(filesDbContext, tenantId, subject));
|
||||||
|
@ -645,7 +645,7 @@ internal abstract class ThirdPartyProviderDao<T> : ThirdPartyProviderDao, IDispo
|
|||||||
|
|
||||||
var filesDbContext = _dbContextFactory.CreateDbContext();
|
var filesDbContext = _dbContextFactory.CreateDbContext();
|
||||||
var entryIDs = await filesDbContext.ThirdpartyIdMapping
|
var entryIDs = await filesDbContext.ThirdpartyIdMapping
|
||||||
.Where(r => r.Id.StartsWith(parentFolder.Id))
|
.Where(r => r.Id.StartsWith(PathPrefix))
|
||||||
.Select(r => r.HashId)
|
.Select(r => r.HashId)
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
|
|
||||||
|
@ -151,7 +151,7 @@ public class FileMarker
|
|||||||
userEntriesData.Add(userID, entries);
|
userEntriesData.Add(userID, entries);
|
||||||
}
|
}
|
||||||
|
|
||||||
RemoveFromCahce(projectsFolder, userID);
|
RemoveFromCahce(projectsFolder, userID);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -813,6 +813,11 @@ public class FileMarker
|
|||||||
parentFolderTag.Id = -1;
|
parentFolderTag.Id = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (parent.FolderType != FolderType.VirtualRooms && parent.RootFolderType == FolderType.VirtualRooms && parent.ProviderEntry)
|
||||||
|
{
|
||||||
|
countSubNew = parentFolderTag.Count;
|
||||||
|
}
|
||||||
|
|
||||||
if (parentFolderTag.Count != countSubNew)
|
if (parentFolderTag.Count != countSubNew)
|
||||||
{
|
{
|
||||||
if (countSubNew > 0)
|
if (countSubNew > 0)
|
||||||
|
Loading…
Reference in New Issue
Block a user