Browse Source

fix: Adjust route constraint to handle URL generation without HttpContext and update route order for Razor Pages

pull/25174/head
maliming 6 months ago
parent
commit
299b4282a7
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 5
      framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpCultureRouteConstraint.cs
  2. 2
      framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpCultureRoutePagesConvention.cs

5
framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpCultureRouteConstraint.cs

@ -23,11 +23,12 @@ public class AbpCultureRouteConstraint : IRouteConstraint
}
var languages = httpContext?.RequestServices
.GetRequiredService<IOptions<AbpLocalizationOptions>>().Value.Languages;
.GetService<IOptions<AbpLocalizationOptions>>()?.Value.Languages;
if (languages == null || languages.Count == 0)
{
return false;
// During URL generation, HttpContext or services may not be available.
return routeDirection == RouteDirection.UrlGeneration;
}
return languages.Any(l =>

2
framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpCultureRoutePagesConvention.cs

@ -34,7 +34,7 @@ public class AbpCultureRoutePagesConvention : IPageRouteModelConvention
AttributeRouteModel = new AttributeRouteModel
{
Template = AttributeRouteModel.CombineTemplates(CultureRouteTemplate, originalTemplate),
Order = 1
Order = -1
}
});
}

Loading…
Cancel
Save