Browse Source

Fix unit tests.

pull/13881/head
maliming 4 years ago
parent
commit
e6981b32ce
No known key found for this signature in database GPG Key ID: 96224957E51C89E
  1. 6
      modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
  2. 4
      modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs

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

@ -69,7 +69,7 @@ public class FeatureAppService : FeatureManagementAppServiceBase, IFeatureAppSer
return new FeatureGroupDto
{
Name = groupDefinition.Name,
DisplayName = groupDefinition.DisplayName.Localize(StringLocalizerFactory),
DisplayName = groupDefinition.DisplayName?.Localize(StringLocalizerFactory),
Features = new List<FeatureDto>()
};
}
@ -79,8 +79,8 @@ public class FeatureAppService : FeatureManagementAppServiceBase, IFeatureAppSer
return new FeatureDto
{
Name = featureDefinition.Name,
DisplayName = featureDefinition.DisplayName.Localize(StringLocalizerFactory),
Description = featureDefinition.Description.Localize(StringLocalizerFactory),
DisplayName = featureDefinition.DisplayName?.Localize(StringLocalizerFactory),
Description = featureDefinition.Description?.Localize(StringLocalizerFactory),
ValueType = featureDefinition.ValueType,

4
modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs

@ -103,7 +103,7 @@ public class PermissionAppService : ApplicationService, IPermissionAppService
{
return new PermissionGrantInfoDto {
Name = permission.Name,
DisplayName = permission.DisplayName.Localize(StringLocalizerFactory),
DisplayName = permission.DisplayName?.Localize(StringLocalizerFactory),
ParentName = permission.Parent?.Name,
AllowedProviders = permission.Providers,
GrantedProviders = new List<ProviderInfoDto>()
@ -117,7 +117,7 @@ public class PermissionAppService : ApplicationService, IPermissionAppService
return new PermissionGroupDto
{
Name = group.Name,
DisplayName = group.DisplayName.Localize(StringLocalizerFactory),
DisplayName = group.DisplayName?.Localize(StringLocalizerFactory),
DisplayNameKey = localizableDisplayName?.Name,
DisplayNameResource = localizableDisplayName?.ResourceType != null
? LocalizationResourceNameAttribute.GetName(localizableDisplayName.ResourceType)

Loading…
Cancel
Save