From e6981b32ce50f21d843227111df9782fbb604478 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 9 Sep 2022 14:21:31 +0800 Subject: [PATCH] Fix unit tests. --- .../Volo/Abp/FeatureManagement/FeatureAppService.cs | 6 +++--- .../Volo/Abp/PermissionManagement/PermissionAppService.cs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs index 40838d5814..c21f40fb65 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs +++ b/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() }; } @@ -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, diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs index 8579fa28ac..9ef60a17e4 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs +++ b/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() @@ -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)