@@ -51,17 +51,17 @@ public CodeSnippetTagHelperComponent(
5151 public override async Task ProcessAsync ( TagHelperContext context , TagHelperOutput output )
5252 {
5353 var contact = ContactManagementContext . CurrentContact ;
54-
55- // Get the current page's content type ID
56- int ? contentTypeId = null ;
57- if ( webPageDataContextRetriever . TryRetrieve ( out var webPageDataContext ) )
54+ if ( ! webPageDataContextRetriever . TryRetrieve ( out var webPageDataContext ) )
5855 {
59- var contentTypeName = webPageDataContext . WebPage . ContentTypeName ;
60- var dataClass = DataClassInfoProvider . GetDataClassInfo ( contentTypeName ) ;
61-
62- contentTypeId = dataClass ? . ClassID ;
56+ return ;
6357 }
6458
59+ var contentTypeName = webPageDataContext . WebPage . ContentTypeName ;
60+ var dataClass = DataClassInfoProvider . GetDataClassInfo ( contentTypeName ) ;
61+
62+ // Get the current page's content type ID
63+ int ? contentTypeId = dataClass ? . ClassID ;
64+
6565 var codeSnippets = await codeSnippetsContext . GetConsentedCodeSnippets ( contact , contentTypeId ) ;
6666
6767 if ( string . Equals ( context . TagName , HeadTag , StringComparison . OrdinalIgnoreCase ) )
@@ -82,7 +82,6 @@ private static void ProcessHead(
8282 {
8383 bool isEditMode = httpContext . Kentico ( ) . PageBuilder ( ) . EditMode ;
8484 bool isPreviewMode = httpContext . Kentico ( ) . Preview ( ) . Enabled ;
85- bool isAdminContext = IsAdminContext ( httpContext ) ;
8685
8786 var headTopSnippets = codeSnippets [ CodeSnippetLocations . HeadTop ] ;
8887 var headBottomSnippets = codeSnippets [ CodeSnippetLocations . HeadBottom ] ;
@@ -103,12 +102,6 @@ private static void ProcessHead(
103102 headBottomSnippets = headBottomSnippets . Where ( x => x . DisplayMode is CodeSnippetAdministrationDisplayMode . Both or
104103 CodeSnippetAdministrationDisplayMode . PreviewOnly ) ;
105104 }
106- else if ( isAdminContext )
107- {
108- headTopSnippets = headTopSnippets . Where ( x => x . DisplayMode is not CodeSnippetAdministrationDisplayMode . None ) ;
109-
110- headBottomSnippets = headBottomSnippets . Where ( x => x . DisplayMode is not CodeSnippetAdministrationDisplayMode . None ) ;
111- }
112105
113106 foreach ( var codeSnippet in headTopSnippets )
114107 {
@@ -128,7 +121,6 @@ private void ProcessBody(
128121 {
129122 bool isEditMode = httpContext . Kentico ( ) . PageBuilder ( ) . EditMode ;
130123 bool isPreviewMode = httpContext . Kentico ( ) . Preview ( ) . Enabled ;
131- bool isAdminContext = IsAdminContext ( httpContext ) ;
132124
133125 var bodyTopSnippets = codeSnippets [ CodeSnippetLocations . BodyTop ] ;
134126 var bodyBottomSnippets = codeSnippets [ CodeSnippetLocations . BodyBottom ] ;
@@ -149,12 +141,6 @@ private void ProcessBody(
149141 bodyBottomSnippets = bodyBottomSnippets . Where ( x => x . DisplayMode is CodeSnippetAdministrationDisplayMode . Both or
150142 CodeSnippetAdministrationDisplayMode . PreviewOnly ) ;
151143 }
152- else if ( isAdminContext )
153- {
154- bodyTopSnippets = bodyTopSnippets . Where ( x => x . DisplayMode is not CodeSnippetAdministrationDisplayMode . None ) ;
155-
156- bodyBottomSnippets = bodyBottomSnippets . Where ( x => x . DisplayMode is not CodeSnippetAdministrationDisplayMode . None ) ;
157- }
158144
159145 foreach ( var codeSnippet in bodyTopSnippets )
160146 {
@@ -169,16 +155,6 @@ private void ProcessBody(
169155 output . PostContent . AppendHtml ( GetScriptSrcTag ( ) ) ;
170156 }
171157
172- private static bool IsAdminContext ( HttpContext ? httpContext )
173- {
174- if ( httpContext is null )
175- {
176- return false ;
177- }
178-
179- var path = httpContext . Request . Path . Value ;
180- return path ? . StartsWith ( "/cmsctx/" , StringComparison . OrdinalIgnoreCase ) == true ;
181- }
182158
183159 private IHtmlContent GetScriptSrcTag ( )
184160 {
0 commit comments