Merge branch 'release/6.33.0'

VirtoCommerce · Oct 30, 2023 · 1429b28 · 1429b28
2 parents 7dd0286 + aa849a9
commit 1429b28
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,7 +7,7 @@
     <Authors>VirtoCommerce</Authors>
   </PropertyGroup>
    <PropertyGroup>
-    <VersionPrefix>6.32.0</VersionPrefix>
+    <VersionPrefix>6.33.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/VirtoCommerce.Storefront/Controllers/Api/ApiCommonController.cs b/VirtoCommerce.Storefront/Controllers/Api/ApiCommonController.cs
@@ -63,7 +63,7 @@ public async Task<ActionResult> Feedback([FromBody] ContactForm model)
 
             return Ok();
         }
-        
+
         [HttpPost("slug")]
         public async Task<SlugInfoResult> GetSlugInfoBySlugAsync([FromBody] SlugInfoRequest slugInfoRequest)
         {
@@ -102,15 +102,15 @@ private async Task<SlugInfoResult> GetSlugInfoAsync(string slug, string culture)
             var bestSeoInfo = seoInfos.FirstOrDefault();
             result.EntityInfo = bestSeoInfo;
 
-            if (result.EntityInfo == null)
+            if (result.EntityInfo == null || result.EntityInfo.ObjectType == "ContentFile")
             {
                 var pageUrl = slug == "__index__home__page__" ? "/" : $"/{slug}";
                 try
                 {
                     var pages = WorkContext.Pages.Where(p =>
                         string.Equals(p.Url, pageUrl, StringComparison.OrdinalIgnoreCase)
                         || string.Equals(p.Url, slug, StringComparison.OrdinalIgnoreCase)
-                    );
+                    ).ToList();
 
                     var page = pages.FirstOrDefault(x => x.Language.CultureName.EqualsInvariant(culture))
                                ?? pages.FirstOrDefault(x => x.Language.IsInvariant)