Skip to content

Commit ee3f22f

Browse files
authored
Merge pull request #22910 from abpframework/FeatureManagement-IsDisabled
Skip disable feature if `value` or `provider name` is `null`.
2 parents 994aad5 + 4a8e985 commit ee3f22f

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,13 @@ protected virtual string GetFeatureStyles(FeatureDto feature)
152152

153153
protected virtual bool IsDisabled(FeatureDto feature)
154154
{
155-
return feature.Provider.Name != ProviderName && feature.Provider.Name != DefaultValueFeatureValueProvider.ProviderName;
155+
return feature.Value != null &&
156+
feature.Provider.Name != null &&
157+
feature.Provider.Name != ProviderName &&
158+
feature.Provider.Name != DefaultValueFeatureValueProvider.ProviderName;
156159
}
157160

158-
public string GetShownName(FeatureDto featureDto)
161+
public virtual string GetShownName(FeatureDto featureDto)
159162
{
160163
return !IsDisabled(featureDto)
161164
? featureDto.DisplayName

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,15 @@ await LocalEventBus.PublishAsync(
8585
return NoContent();
8686
}
8787

88-
public bool IsDisabled(FeatureDto featureDto)
88+
public virtual bool IsDisabled(FeatureDto feature)
8989
{
90-
return featureDto.Provider.Name != ProviderName && featureDto.Provider.Name != DefaultValueFeatureValueProvider.ProviderName;
90+
return feature.Value != null &&
91+
feature.Provider.Name != null &&
92+
feature.Provider.Name != ProviderName &&
93+
feature.Provider.Name != DefaultValueFeatureValueProvider.ProviderName;
9194
}
9295

93-
public string GetShownName(FeatureDto featureDto)
96+
public virtual string GetShownName(FeatureDto featureDto)
9497
{
9598
return !IsDisabled(featureDto)
9699
? featureDto.DisplayName

0 commit comments

Comments
 (0)