Browse Source

Merge pull request #22910 from abpframework/FeatureManagement-IsDisabled

Skip disable feature if `value` or `provider name` is `null`.
pull/22925/head
Engincan VESKE 1 year ago
committed by GitHub
parent
commit
ee3f22f71c
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 7
      modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs
  2. 9
      modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs

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

@ -152,10 +152,13 @@ public partial class FeatureManagementModal
protected virtual bool IsDisabled(FeatureDto feature) protected virtual bool IsDisabled(FeatureDto feature)
{ {
return feature.Provider.Name != ProviderName && feature.Provider.Name != DefaultValueFeatureValueProvider.ProviderName; return feature.Value != null &&
feature.Provider.Name != null &&
feature.Provider.Name != ProviderName &&
feature.Provider.Name != DefaultValueFeatureValueProvider.ProviderName;
} }
public string GetShownName(FeatureDto featureDto) public virtual string GetShownName(FeatureDto featureDto)
{ {
return !IsDisabled(featureDto) return !IsDisabled(featureDto)
? featureDto.DisplayName ? featureDto.DisplayName

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

@ -85,12 +85,15 @@ public class FeatureManagementModal : AbpPageModel
return NoContent(); return NoContent();
} }
public bool IsDisabled(FeatureDto featureDto) public virtual bool IsDisabled(FeatureDto feature)
{ {
return featureDto.Provider.Name != ProviderName && featureDto.Provider.Name != DefaultValueFeatureValueProvider.ProviderName; return feature.Value != null &&
feature.Provider.Name != null &&
feature.Provider.Name != ProviderName &&
feature.Provider.Name != DefaultValueFeatureValueProvider.ProviderName;
} }
public string GetShownName(FeatureDto featureDto) public virtual string GetShownName(FeatureDto featureDto)
{ {
return !IsDisabled(featureDto) return !IsDisabled(featureDto)
? featureDto.DisplayName ? featureDto.DisplayName

Loading…
Cancel
Save