Skip to content

MNTP: Improve site and root context for dynamic root #17303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zeegaan merged 1 commit into from
Oct 18, 2024
Merged

MNTP: Improve site and root context for dynamic root #17303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Umbraco.Core/DynamicRoot/Origin/RootDynamicRootOriginFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ public RootDynamicRootOriginFinder(IEntityService entityService)
return null;
}

var entity = _entityService.Get(query.Context.ParentKey);
// when creating new content, CurrentKey will be null - fallback to using ParentKey
Guid entityKey = query.Context.CurrentKey ?? query.Context.ParentKey;
var entity = _entityService.Get(entityKey);

if (entity is null || _allowedObjectTypes.Contains(entity.NodeObjectType) is false)
{
Expand Down
6 changes: 4 additions & 2 deletions src/Umbraco.Core/DynamicRoot/Origin/SiteDynamicRootOriginFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ public SiteDynamicRootOriginFinder(IEntityService entityService, IDomainService

public override Guid? FindOriginKey(DynamicRootNodeQuery query)
{
if (query.OriginAlias != SupportedOriginType || query.Context.CurrentKey.HasValue is false)
if (query.OriginAlias != SupportedOriginType)
{
return null;
}

IEntitySlim? entity = _entityService.Get(query.Context.CurrentKey.Value);
// when creating new content, CurrentKey will be null - fallback to using ParentKey
Guid entityKey = query.Context.CurrentKey ?? query.Context.ParentKey;
IEntitySlim? entity = _entityService.Get(entityKey);
if (entity is null || entity.NodeObjectType != Constants.ObjectTypes.Document)
{
return null;
Expand Down