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 2020-05-18 11:59:37 +03:00
parent f0adf6d38e
commit 7e387cf51a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
products/ASC.Files/Server/Core/Dao/TeamlabDao/FileDao.cs
View File

@ -402,7 +402,6 @@ namespace ASC.Files.Core.Data
if (file.CreateBy == default) file.CreateBy = AuthContext.CurrentAccount.ID;
if (file.CreateOn == default) file.CreateOn = TenantUtil.DateTimeNow();
var fileIdString = file.ID.ToString();
var toUpdate = FilesDbContext.Files
.Where(r => r.Id == file.ID && r.CurrentVersion && r.TenantId == TenantID)
.FirstOrDefault();
@ -1320,6 +1319,7 @@ namespace ASC.Files.Core.Data
public File<int> ToFile(DbFileQuery r)
{
var file = ServiceProvider.GetService<File<int>>();
if (r == null) return null;
file.ID = r.file.Id;
file.Title = r.file.Title;
file.FolderID = r.file.FolderId;

1
products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
View File

@ -1028,6 +1028,7 @@ namespace ASC.Files.Core.Data
public Folder<int> ToFolder(DbFolderQuery r)
{
if (r == null) return null;
var result = ServiceProvider.GetService<Folder<int>>();
result.ID = r.folder.Id;
result.ParentFolderID = r.folder.ParentId;