Skip to content
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

Jump to bottom

PT-13653: ignore ContentFIle object from platform response #660

Merged
merged 1 commit into from
Oct 30, 2023
Merged

PT-13653: ignore ContentFIle object from platform response #660

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
6 changes: 3 additions & 3 deletions VirtoCommerce.Storefront/Controllers/Api/ApiCommonController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public async Task<ActionResult> Feedback([FromBody] ContactForm model)

return Ok();
}

[HttpPost("slug")]
public async Task<SlugInfoResult> GetSlugInfoBySlugAsync([FromBody] SlugInfoRequest slugInfoRequest)
{
Expand Down Expand Up @@ -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)
Expand Down
Loading