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

Merge branch 'master' into feature/files

Browse Source
This commit is contained in:
Ilya Oleshko 2020-05-06 10:28:36 +03:00
commit 5aae59fb21
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -926,6 +926,8 @@ namespace ASC.Files.Core.Data
tx.Commit(); //Commit changes
}
FilesDbContext.SaveChanges();
return newFolderId;
}

12
products/ASC.Files/Server/Core/FileStorageService.cs
View File

@ -2015,18 +2015,6 @@ namespace ASC.Web.Files.Services.WCFService
}
}
private static void ParseArrayItems(Dictionary<string, string> items, out Dictionary<object, string> folders, out Dictionary<object, string> files)
{
//TODO:!!!!Fix
folders = new Dictionary<object, string>();
files = new Dictionary<object, string>();
foreach (var item in (items ?? new Dictionary<string, string>()))
{
if (item.Key.StartsWith("file_")) files.Add(item.Key.Substring("file_".Length), item.Value);
if (item.Key.StartsWith("folder_")) folders.Add(item.Key.Substring("folder_".Length), item.Value);
}
}
private static void ErrorIf(bool condition, string errorMessage)
{
if (condition) throw new InvalidOperationException(errorMessage);