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

Files: my documents folder changed to current location

Browse Source
This commit is contained in:
Maksim Chegulov 2022-12-20 00:30:12 +03:00
parent 22f19bede7
commit 8e83ebfd7d
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
products/ASC.Files/Core/Core/FileStorageService.cs
View File

@ -2177,15 +2177,14 @@ public class FileStorageService<T> //: IFileStorageService
if (_configuration.EditorConfig.ModeWrite
&& _fileUtility.CanWebRestrictedEditing(file.Title)
&& await _fileSecurity.CanFillFormsAsync(file)
&& !await _fileSecurity.CanEditAsync(file))
&& await _fileSecurity.CanFillFormsAsync(file))
{
if (!file.IsFillFormDraft)
{
await _fileMarker.RemoveMarkAsNewAsync(file);
Folder<int> folderIfNew;
File<int> form;
Folder<T> folderIfNew;
File<T> form;
try
{
(form, folderIfNew) = await _entryManager.GetFillFormDraftAsync(file);

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

@ -1027,23 +1027,24 @@ public class EntryManager
return _lockerManager.FileLockedByAsync(fileId, tagDao);
}
public async Task<(File<int> file, Folder<int> folderIfNew)> GetFillFormDraftAsync<T>(File<T> sourceFile)
public async Task<(File<T> file, Folder<T> folderIfNew)> GetFillFormDraftAsync<T>(File<T> sourceFile)
{
Folder<int> folderIfNew = null;
Folder<T> folderIfNew = null;
if (sourceFile == null)
{
return (null, folderIfNew);
}
File<int> linkedFile = null;
var fileDao = _daoFactory.GetFileDao<int>();
File<T> linkedFile = null;
var fileDao = _daoFactory.GetFileDao<T>();
var sourceFileDao = _daoFactory.GetFileDao<T>();
var linkDao = _daoFactory.GetLinkDao();
var linkedId = await linkDao.GetLinkedAsync(sourceFile.Id.ToString());
if (linkedId != null)
{
linkedFile = await fileDao.GetFileAsync(int.Parse(linkedId));
linkedFile = await fileDao.GetFileAsync((T)Convert.ChangeType(linkedId, typeof(T)));
if (linkedFile == null
|| !await _fileSecurity.CanFillFormsAsync(linkedFile)
|| await FileLockedForMeAsync(linkedFile.Id)
@ -1056,21 +1057,24 @@ public class EntryManager
if (linkedFile == null)
{
var folderId = _globalFolderHelper.FolderMy;
var folderDao = _daoFactory.GetFolderDao<int>();
var folderId = sourceFile.ParentId;
var folderDao = _daoFactory.GetFolderDao<T>();
folderIfNew = await folderDao.GetFolderAsync(folderId);
if (folderIfNew == null)
{
throw new Exception(FilesCommonResource.ErrorMassage_FolderNotFound);
}
if (!await _fileSecurity.CanCreateAsync(folderIfNew))
if (!await _fileSecurity.CanFillFormsAsync(folderIfNew))
{
throw new SecurityException(FilesCommonResource.ErrorMassage_SecurityException_Create);
}
linkedFile = _serviceProvider.GetService<File<int>>();
linkedFile.Title = sourceFile.Title;
var ext = FileUtility.GetFileExtension(sourceFile.Title);
var title = Path.GetFileNameWithoutExtension(sourceFile.Title);
linkedFile = _serviceProvider.GetService<File<T>>();
linkedFile.Title = $"{title}-{DateTime.UtcNow:s}{ext}";
linkedFile.ParentId = folderIfNew.Id;
linkedFile.FileStatus = sourceFile.FileStatus;
linkedFile.ConvertedType = sourceFile.ConvertedType;