Browse Source

Add another constructor to `TemplateDefinition`.

pull/16754/head
maliming 3 years ago
parent
commit
a8130614e5
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 12
      framework/src/Volo.Abp.TextTemplating.Core/Volo/Abp/TextTemplating/TemplateDefinition.cs
  2. 12
      framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TestTemplateDefinitionProvider.cs
  3. 2
      modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/Emailing/Templates/AccountEmailTemplateDefinitionProvider.cs

12
framework/src/Volo.Abp.TextTemplating.Core/Volo/Abp/TextTemplating/TemplateDefinition.cs

@ -58,6 +58,18 @@ public class TemplateDefinition : IHasNameWithLocalizableDisplayName
[NotNull] [NotNull]
public Dictionary<string, object> Properties { get; } public Dictionary<string, object> Properties { get; }
public TemplateDefinition(
[NotNull] string name,
[CanBeNull] Type localizationResource,
[CanBeNull] ILocalizableString displayName = null,
bool isLayout = false,
string layout = null,
string defaultCultureName = null)
: this(name, LocalizationResourceNameAttribute.GetName(localizationResource), displayName, isLayout, layout, defaultCultureName)
{
}
public TemplateDefinition( public TemplateDefinition(
[NotNull] string name, [NotNull] string name,
[CanBeNull] string localizationResourceName = null, [CanBeNull] string localizationResourceName = null,

12
framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TestTemplateDefinitionProvider.cs

@ -1,6 +1,4 @@
using JetBrains.Annotations; using Volo.Abp.TextTemplating.Localization;
using Volo.Abp.Localization;
using Volo.Abp.TextTemplating.Localization;
using Volo.Abp.TextTemplating.Razor; using Volo.Abp.TextTemplating.Razor;
using Volo.Abp.TextTemplating.Scriban; using Volo.Abp.TextTemplating.Scriban;
@ -20,7 +18,7 @@ public class TestTemplateDefinitionProvider : TemplateDefinitionProvider
context.Add( context.Add(
new TemplateDefinition( new TemplateDefinition(
TestTemplates.ForgotPasswordEmail, TestTemplates.ForgotPasswordEmail,
localizationResourceName: LocalizationResourceNameAttribute.GetName(typeof(TestLocalizationSource)), localizationResource: typeof(TestLocalizationSource),
layout: TestTemplates.TestTemplateLayout1 layout: TestTemplates.TestTemplateLayout1
) )
); );
@ -35,7 +33,7 @@ public class TestTemplateDefinitionProvider : TemplateDefinitionProvider
context.Add( context.Add(
new TemplateDefinition( new TemplateDefinition(
TestTemplates.ShowDecimalNumber, TestTemplates.ShowDecimalNumber,
localizationResourceName: LocalizationResourceNameAttribute.GetName(typeof(TestLocalizationSource)), localizationResource: typeof(TestLocalizationSource),
layout: TestTemplates.TestTemplateLayout1 layout: TestTemplates.TestTemplateLayout1
) )
); );
@ -43,7 +41,7 @@ public class TestTemplateDefinitionProvider : TemplateDefinitionProvider
context.Add( context.Add(
new TemplateDefinition( new TemplateDefinition(
TestTemplates.HybridTemplateScriban, TestTemplates.HybridTemplateScriban,
localizationResourceName: LocalizationResourceNameAttribute.GetName(typeof(TestLocalizationSource)), localizationResource: typeof(TestLocalizationSource),
layout: null layout: null
) )
.WithVirtualFilePath("/SampleTemplates/TestScribanTemplate.tpl", true) .WithVirtualFilePath("/SampleTemplates/TestScribanTemplate.tpl", true)
@ -53,7 +51,7 @@ public class TestTemplateDefinitionProvider : TemplateDefinitionProvider
context.Add( context.Add(
new TemplateDefinition( new TemplateDefinition(
TestTemplates.HybridTemplateRazor, TestTemplates.HybridTemplateRazor,
localizationResourceName: LocalizationResourceNameAttribute.GetName(typeof(TestLocalizationSource)), localizationResource: typeof(TestLocalizationSource),
layout: null layout: null
) )
.WithVirtualFilePath("/SampleTemplates/TestRazorTemplate.cshtml", true) .WithVirtualFilePath("/SampleTemplates/TestRazorTemplate.cshtml", true)

2
modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/Emailing/Templates/AccountEmailTemplateDefinitionProvider.cs

@ -14,7 +14,7 @@ public class AccountEmailTemplateDefinitionProvider : TemplateDefinitionProvider
AccountEmailTemplates.PasswordResetLink, AccountEmailTemplates.PasswordResetLink,
displayName: LocalizableString.Create<AccountResource>($"TextTemplate:{AccountEmailTemplates.PasswordResetLink}"), displayName: LocalizableString.Create<AccountResource>($"TextTemplate:{AccountEmailTemplates.PasswordResetLink}"),
layout: StandardEmailTemplates.Layout, layout: StandardEmailTemplates.Layout,
localizationResourceName: LocalizationResourceNameAttribute.GetName(typeof(AccountResource)) localizationResource: typeof(AccountResource)
).WithVirtualFilePath("/Volo/Abp/Account/Emailing/Templates/PasswordResetLink.tpl", true) ).WithVirtualFilePath("/Volo/Abp/Account/Emailing/Templates/PasswordResetLink.tpl", true)
); );
} }

Loading…
Cancel
Save