Merge pull request #7420 from abpframework/enisn/cmskit/tag-definition-fix

Cms Kit - Handle nullability of TagDefinition DisplayName
6 years ago · 9be19da6e8
1 changed files with 3 additions and 1 deletions
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs
@ -78,7 +78,9 @@ namespace Volo.CmsKit.Admin.Tags

            return definitions
                        .Select(s => 
-                            new TagDefinitionDto(s.EntityType, s.DisplayName.Localize(StringLocalizerFactory)))
+                            new TagDefinitionDto(
+                                s.EntityType, 
+                                s.DisplayName?.Localize(StringLocalizerFactory) ?? s.EntityType))
                        .ToList();
        }
    }