Merge branch 'develop' into feature/create-room

This commit is contained in:
Alexey Safronov 2022-08-24 17:55:37 +03:00
commit ccea188dd4
2 changed files with 7 additions and 1 deletions

View File

@ -403,7 +403,13 @@ internal class SharePointFolderDao : SharePointDaoBase, IFolderDao<string>
else
{
newFolderId = (string)await ProviderInfo.RenameFolderAsync(folder.Id, newTitle);
if (DocSpaceHelper.IsRoom(ProviderInfo.FolderType) && ProviderInfo.FolderId != null && ProviderInfo.FolderId == oldId)
{
await DaoSelector.UpdateProviderFolderId(ProviderInfo, newFolderId);
}
}
await UpdatePathInDBAsync(oldId, newFolderId);
return newFolderId;

View File

@ -462,7 +462,7 @@ internal class SharpBoxFolderDao : SharpBoxDaoBase, IFolderDao<string>
//var newFolder = SharpBoxProviderInfo.Storage.GetFileSystemObject(newTitle, folder.Parent);
newId = MakeId(entry);
if (DocSpaceHelper.IsRoom(ProviderInfo.FolderType))
if (DocSpaceHelper.IsRoom(ProviderInfo.FolderType) && ProviderInfo.FolderId != null && ProviderInfo.FolderId == oldId)
{
await DaoSelector.UpdateProviderFolderId(ProviderInfo, newId);
}