Browse Source

Fix feature management module for localization changes.

pull/13845/head
Halil İbrahim Kalkan 4 years ago
parent
commit
1945ae7c2b
  1. 4
      modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs
  2. 13
      modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor.cs
  3. 6
      modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingViewModel.cs
  4. 11
      modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml

4
modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs

@ -194,8 +194,8 @@ public partial class FeatureManagementModal
protected virtual IStringLocalizer CreateStringLocalizer(string resourceName)
{
var resource = LocalizationOptions.Value.Resources.Values.FirstOrDefault(x => x.ResourceName == resourceName);
return HtmlLocalizerFactory.Create(resource != null ? resource.ResourceType : LocalizationOptions.Value.DefaultResourceType);
return StringLocalizerFactory.CreateByResourceNameOrNull(resourceName) ??
StringLocalizerFactory.CreateDefaultOrNull();
}
protected virtual Task ClosingModal(ModalClosingEventArgs eventArgs)

13
modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor.cs

@ -10,9 +10,6 @@ namespace Volo.Abp.FeatureManagement.Blazor.Components.FeatureSettingGroup;
public partial class FeatureSettingManagementComponent : AbpComponentBase
{
[Inject]
protected IStringLocalizer<AbpFeatureManagementResource> L { get; set; }
[Inject]
protected PermissionChecker PermissionChecker { get; set; }
@ -20,6 +17,11 @@ public partial class FeatureSettingManagementComponent : AbpComponentBase
protected FeatureSettingViewModel Settings;
public FeatureSettingManagementComponent()
{
LocalizationResource = typeof(AbpFeatureManagementResource);
}
protected async override Task OnInitializedAsync()
{
Settings = new FeatureSettingViewModel
@ -32,9 +34,4 @@ public partial class FeatureSettingManagementComponent : AbpComponentBase
{
await FeatureManagementModal.OpenAsync(TenantFeatureValueProvider.ProviderName);
}
}
public class FeatureSettingViewModel
{
public bool HasManageHostFeaturesPermission { get; set; }
}

6
modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingViewModel.cs

@ -0,0 +1,6 @@
namespace Volo.Abp.FeatureManagement.Blazor.Components.FeatureSettingGroup;
public class FeatureSettingViewModel
{
public bool HasManageHostFeaturesPermission { get; set; }
}

11
modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml

@ -1,22 +1,21 @@
@page
@using Microsoft.AspNetCore.Mvc.Localization
@using Microsoft.Extensions.Options
@using Microsoft.Extensions.Localization
@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
@using Volo.Abp.FeatureManagement.Localization
@using Volo.Abp.Validation.StringValues
@using Volo.Abp.FeatureManagement.Web.Pages.FeatureManagement
@using Volo.Abp.Localization
@model FeatureManagementModal
@inject IHtmlLocalizer<AbpFeatureManagementResource> L
@inject IHtmlLocalizerFactory HtmlLocalizerFactory
@inject IOptions<AbpLocalizationOptions> LocalizationOptions
@inject IStringLocalizerFactory StringLocalizerFactory
@{
Layout = null;
IHtmlLocalizer CreateHtmlLocalizer(string resourceName)
{
var resource = LocalizationOptions.Value.Resources.Values.FirstOrDefault(x => x.ResourceName == resourceName);
return HtmlLocalizerFactory.Create(resource != null ? resource.ResourceType : LocalizationOptions.Value.DefaultResourceType);
var localizer = StringLocalizerFactory.CreateByResourceNameOrNull(resourceName) ??
StringLocalizerFactory.CreateDefaultOrNull();
return new HtmlLocalizer(localizer);
}
}
<form method="post" asp-page="/FeatureManagement/FeatureManagementModal" data-script-class="abp.modals.FeatureManagement">

Loading…
Cancel
Save