Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Authors>$(Company)</Authors>
<Copyright>Copyright © $(Company) $([System.DateTime]::Now.Year)</Copyright>
<Trademark>$(Company)™</Trademark>
<VersionPrefix>5.0.1</VersionPrefix>
<VersionPrefix>5.0.2</VersionPrefix>
<VersionSuffix></VersionSuffix>
<PackageLicenseExpression>MIT</PackageLicenseExpression>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using CMS.ContactManagement;
using CMS.DataEngine;
using CMS.Websites.Routing;

using Kentico.Content.Web.Mvc;
using Kentico.PageBuilder.Web.Mvc;
Expand All @@ -26,19 +27,22 @@ internal class CodeSnippetTagHelperComponent : TagHelperComponent
private readonly IFileVersionProvider fileVersionProvider;
private readonly IHttpContextAccessor httpContextAccessor;
private readonly IWebPageDataContextRetriever webPageDataContextRetriever;
private readonly IWebsiteChannelContext websiteChannelContext;

public CodeSnippetTagHelperComponent(
IChannelCodeSnippetsService codeSnippetsContext,
IUrlHelperFactory urlHelperFactory,
IFileVersionProvider fileVersionProvider,
IHttpContextAccessor httpContextAccessor,
IWebPageDataContextRetriever webPageDataContextRetriever)
IWebPageDataContextRetriever webPageDataContextRetriever,
IWebsiteChannelContext websiteChannelContext)
{
this.codeSnippetsContext = codeSnippetsContext;
this.urlHelperFactory = urlHelperFactory;
this.httpContextAccessor = httpContextAccessor;
this.fileVersionProvider = fileVersionProvider;
this.webPageDataContextRetriever = webPageDataContextRetriever;
this.websiteChannelContext = websiteChannelContext;
}

/// <summary>
Expand All @@ -52,16 +56,20 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
{
var contact = ContactManagementContext.CurrentContact;

if (!webPageDataContextRetriever.TryRetrieve(out var webPageDataContext))
if (websiteChannelContext.WebsiteChannelID <= 0)
{
return;
}

var contentTypeName = webPageDataContext.WebPage.ContentTypeName;
var dataClass = DataClassInfoProvider.GetDataClassInfo(contentTypeName);

// Get the current page's content type ID
int? contentTypeId = dataClass?.ClassID;
int? contentTypeId = null;
if (webPageDataContextRetriever.TryRetrieve(out var webPageDataContext))
{
var contentTypeName = webPageDataContext.WebPage.ContentTypeName;
var dataClass = DataClassInfoProvider.GetDataClassInfo(contentTypeName);

contentTypeId = dataClass?.ClassID;
}

var codeSnippets = await codeSnippetsContext.GetConsentedCodeSnippets(contact, contentTypeId);

Expand Down