Browse Source

Fix unit test.

pull/5176/head
maliming 6 years ago
parent
commit
ee84225260
  1. 7
      modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
  2. 8
      modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManager.cs

7
modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs

@ -33,8 +33,7 @@ namespace Volo.Abp.FeatureManagement
foreach (var featureDefinition in featureDefinitions)
{
var value = await FeatureManager.GetOrNullWithProviderAsync(featureDefinition.Name, providerName,
providerKey);
var feature = await FeatureManager.GetOrNullWithProviderAsync(featureDefinition.Name, providerName, providerKey);
features.Add(new FeatureDto
{
Name = featureDefinition.Name,
@ -42,8 +41,8 @@ namespace Volo.Abp.FeatureManagement
ValueType = featureDefinition.ValueType,
Description = featureDefinition.Description?.Localize(StringLocalizerFactory),
ParentName = featureDefinition.Parent?.Name,
Value = value.Value,
ProviderName = value.Provider.Name
Value = feature.Value,
ProviderName = feature.Provider?.Name
});
}

8
modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManager.cs

@ -184,7 +184,7 @@ namespace Volo.Abp.FeatureManagement
providers = providers.SkipWhile(c => c.Name != providerName);
}
FeatureNameValueWithGrantedProvider featureNameValueWithGrantedProvider = null;
var featureNameValueWithGrantedProvider = new FeatureNameValueWithGrantedProvider(name, null);
foreach (var provider in providers)
{
string pk = null;
@ -196,10 +196,8 @@ namespace Volo.Abp.FeatureManagement
var value = await provider.GetOrNullAsync(feature, pk);
if (value != null)
{
featureNameValueWithGrantedProvider = new FeatureNameValueWithGrantedProvider(name, value)
{
Provider = new FeatureValueProviderInfo(provider.Name, pk)
};
featureNameValueWithGrantedProvider.Value = value;
featureNameValueWithGrantedProvider.Provider = new FeatureValueProviderInfo(provider.Name, pk);
break;
}
}

Loading…
Cancel
Save