Merge branch 'oqtane:dev' into dev

This commit is contained in:
vnetonline
2023-06-30 07:41:49 +10:00
committed by GitHub
4 changed files with 53 additions and 81 deletions

View File

@ -124,7 +124,10 @@ namespace Oqtane.Controllers
Folder parent = _folders.GetFolder(folder.ParentId.Value);
folder.Path = Utilities.UrlCombine(parent.Path, folder.Name);
}
folder.Path = folder.Path + "/";
if (!folder.Path.EndsWith("/"))
{
folder.Path = folder.Path + "/";
}
folder = _folders.AddFolder(folder);
_syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Folder, folder.FolderId, SyncEventActions.Create);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Folder Added {Folder}", folder);
@ -166,7 +169,10 @@ namespace Oqtane.Controllers
Folder parent = _folders.GetFolder(folder.ParentId.Value);
folder.Path = Utilities.UrlCombine(parent.Path, folder.Name);
}
folder.Path = folder.Path + "/";
if (!folder.Path.EndsWith("/"))
{
folder.Path = folder.Path + "/";
}
Folder _folder = _folders.GetFolder(id, false);
if (_folder.Path != folder.Path && Directory.Exists(_folders.GetFolderPath(_folder)))