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

Merge branch 'develop' into release/v0.0.2

Browse Source
This commit is contained in:
pavelbannov 2020-12-11 13:02:11 +03:00
commit fa7d8e2010
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/ASC.Common/Threading/DistributedTask.cs
View File

@ -103,11 +103,11 @@ namespace ASC.Common.Threading
if (val == null) return default;
var resType = typeof(T);
object result = val.Value;
object result = val.Value.Trim('"');
if(resType == typeof(Guid))
{
result = Guid.Parse(val.Value.Trim('"'));
result = Guid.Parse(val.Value);
}
else if(resType.IsEnum)
{

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

@ -77,8 +77,21 @@ namespace ASC.Files.Core.Data
public IEnumerable<Tag> GetTags(Guid subject, TagType tagType, IEnumerable<FileEntry<T>> fileEntries)
{
var filesId = fileEntries.Where(e => e.FileEntryType == FileEntryType.File).Select(e => MappingID(e.ID).ToString()).ToList();
var foldersId = fileEntries.Where(e => e.FileEntryType == FileEntryType.Folder).Select(e => MappingID(e.ID).ToString()).ToList();
var filesId = new HashSet<string>();
var foldersId = new HashSet<string>();
foreach(var f in fileEntries)
{
var id = MappingID(f.ID).ToString();
if (f.FileEntryType == FileEntryType.File)
{
filesId.Add(id);
}
else if (f.FileEntryType == FileEntryType.Folder)
{
foldersId.Add(id);
}
}
var q = Query(FilesDbContext.Tag)
.Join(FilesDbContext.TagLink, r => r.Id, l => l.TagId, (tag, link) => new TagLinkData { Tag = tag, Link = link })
@ -406,7 +419,7 @@ namespace ASC.Files.Core.Data
.ToList();
var entryIds = tags.Select(r => r.EntryId).ToList();
var entryTypes = tags.Select(r => (int)r.EntryType).ToList();
var entryTypes = tags.Select(r => (int)r.EntryType).Distinct().ToList();
var sqlQuery = Query(FilesDbContext.Tag)
.Join(FilesDbContext.TagLink, r => r.Id, l => l.TagId, (tag, link) => new TagLinkData { Tag = tag, Link = link })

2
products/ASC.Files/Core/Model/FolderContentWrapper.cs
View File

@ -180,7 +180,7 @@ namespace ASC.Api.Documents
List<Tuple<FileEntry<T1>, bool>> GetFoldersIntWithRights<T1>()
{
var folderDao = DaoFactory.GetFolderDao<T1>();
var folders = folderDao.GetFolders(folderItems.Entries.OfType<FileEntry<T1>>().Select(r => r.FolderID).ToList());
var folders = folderDao.GetFolders(folderItems.Entries.OfType<FileEntry<T1>>().Select(r => r.FolderID).Distinct().ToList());
return FileSecurity.CanRead(folders);
}
}