Merge branch 'release/6.14.0'

VirtoCommerce · Apr 3, 2023 · 74b2bb4 · 74b2bb4
2 parents 4b0306b + f9c641e
commit 74b2bb4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,7 +7,7 @@
     <Authors>VirtoCommerce</Authors>
   </PropertyGroup>
    <PropertyGroup>
-    <VersionPrefix>6.13.0</VersionPrefix>
+    <VersionPrefix>6.14.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
@@ -67,16 +67,20 @@ public async Task<SlugInfoResult> GetInfoBySlugAsync(string slug, [FromQuery] st
         {
             var result = new SlugInfoResult();
 
-            var seoInfos = await _seoInfoService.GetBestMatchingSeoInfos(slug, WorkContext.CurrentStore, culture);
+            if (string.IsNullOrEmpty(slug))
+            {
+                return result;
+            }
 
+            var segments = slug.Split("/", StringSplitOptions.RemoveEmptyEntries);
+            var lastSegment = segments.Last();
+            var seoInfos = await _seoInfoService.GetBestMatchingSeoInfos(lastSegment, WorkContext.CurrentStore, culture);
             var bestSeoInfo = seoInfos.FirstOrDefault();
-
             result.EntityInfo = bestSeoInfo;
 
-
             if (result.EntityInfo == null)
             {
-                var pageUrl = slug == "home" ? "/" : $"/{slug}";
+                var pageUrl = slug == "__index__home__page__" ? "/" : $"/{slug}";
                 try
                 {
                     var pages = WorkContext.Pages.Where(p =>