From 451f4fd48e14f6b17ddd36fbd684770d3265ab1f Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:20:39 +0300 Subject: [PATCH] EmailTemplateOptions to AbpEmailTemplateOptions --- .../Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs | 2 +- .../{EmailTemplateOptions.cs => AbpEmailTemplateOptions.cs} | 4 ++-- .../Abp/Emailing/Templates/EmailTemplateDefinitionManager.cs | 4 ++-- .../Volo/Abp/Emailing/Templates/EmailTemplateProvider.cs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/{EmailTemplateOptions.cs => AbpEmailTemplateOptions.cs} (82%) diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs index d3a9598da1..2d739c9fae 100644 --- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs @@ -49,7 +49,7 @@ namespace Volo.Abp.Emailing } }); - services.Configure(options => + services.Configure(options => { options.DefinitionProviders.AddIfNotContains(definitionProviders); }); diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateOptions.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/AbpEmailTemplateOptions.cs similarity index 82% rename from framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateOptions.cs rename to framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/AbpEmailTemplateOptions.cs index 57533b1aff..cb5a9d370b 100644 --- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateOptions.cs +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/AbpEmailTemplateOptions.cs @@ -2,13 +2,13 @@ namespace Volo.Abp.Emailing.Templates { - public class EmailTemplateOptions + public class AbpEmailTemplateOptions { public string DefaultLayout { get; set; } public ITypeList DefinitionProviders { get; } - public EmailTemplateOptions() + public AbpEmailTemplateOptions() { DefaultLayout = StandardEmailTemplates.DefaultLayout; diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionManager.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionManager.cs index a6a58aef27..0491dc867e 100644 --- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionManager.cs +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionManager.cs @@ -12,12 +12,12 @@ namespace Volo.Abp.Emailing.Templates { protected Lazy> EmailTemplateDefinitions { get; } - protected EmailTemplateOptions Options { get; } + protected AbpEmailTemplateOptions Options { get; } protected IServiceProvider ServiceProvider { get; } public EmailTemplateDefinitionManager( - IOptions options, + IOptions options, IServiceProvider serviceProvider) { ServiceProvider = serviceProvider; diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateProvider.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateProvider.cs index e8a2a9bac8..c67af27757 100644 --- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateProvider.cs +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateProvider.cs @@ -12,12 +12,12 @@ namespace Volo.Abp.Emailing.Templates { protected IEmailTemplateDefinitionManager EmailTemplateDefinitionManager; protected ITemplateLocalizer TemplateLocalizer { get; } - protected EmailTemplateOptions Options { get; } + protected AbpEmailTemplateOptions Options { get; } protected IStringLocalizerFactory StringLocalizerFactory; public EmailTemplateProvider(IEmailTemplateDefinitionManager emailTemplateDefinitionManager, ITemplateLocalizer templateLocalizer, IStringLocalizerFactory stringLocalizerFactory, - IOptions options) + IOptions options) { EmailTemplateDefinitionManager = emailTemplateDefinitionManager; TemplateLocalizer = templateLocalizer;