Browse Source

CmsKit - Make case-insensitive check for MediaDescriptorDefinitionStore

pull/7911/head
enisn 6 years ago
parent
commit
249dabdef4
  1. 7
      modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationModule.cs
  2. 4
      modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/MediaDescriptors/DefaultMediaDescriptorDefinitionStore.cs

7
modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationModule.cs

@ -21,15 +21,12 @@ namespace Volo.CmsKit.Admin
)] )]
public class CmsKitAdminApplicationModule : AbpModule public class CmsKitAdminApplicationModule : AbpModule
{ {
public override void PreConfigureServices(ServiceConfigurationContext context)
{
ConfigureTagOptions();
}
public override void ConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context)
{ {
context.Services.AddAutoMapperObjectMapper<CmsKitAdminApplicationModule>(); context.Services.AddAutoMapperObjectMapper<CmsKitAdminApplicationModule>();
ConfigureTagOptions();
Configure<AbpAutoMapperOptions>(options => Configure<AbpAutoMapperOptions>(options =>
{ {
options.AddMaps<CmsKitAdminApplicationModule>(validate: true); options.AddMaps<CmsKitAdminApplicationModule>(validate: true);

4
modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/MediaDescriptors/DefaultMediaDescriptorDefinitionStore.cs

@ -29,7 +29,7 @@ namespace Volo.CmsKit.MediaDescriptors
{ {
Check.NotNullOrWhiteSpace(entityType, nameof(entityType)); Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
var result = Options.EntityTypes.SingleOrDefault(x => x.EntityType == entityType) ?? var result = Options.EntityTypes.SingleOrDefault(x => x.EntityType.Equals(entityType, StringComparison.InvariantCultureIgnoreCase)) ??
throw new EntityCantHaveMediaException(entityType); throw new EntityCantHaveMediaException(entityType);
return Task.FromResult(result); return Task.FromResult(result);
@ -39,7 +39,7 @@ namespace Volo.CmsKit.MediaDescriptors
{ {
Check.NotNullOrEmpty(entityType, nameof(entityType)); Check.NotNullOrEmpty(entityType, nameof(entityType));
var isDefined = Options.EntityTypes.Any(a => a.EntityType == entityType); var isDefined = Options.EntityTypes.Any(a => a.EntityType.Equals(entityType, StringComparison.InvariantCultureIgnoreCase));
return Task.FromResult(isDefined); return Task.FromResult(isDefined);
} }

Loading…
Cancel
Save