From 20db982c20fec04713afc8243ece1522e96cce63 Mon Sep 17 00:00:00 2001 From: enisn Date: Wed, 13 Jan 2021 11:47:03 +0300 Subject: [PATCH] CmsKit - Move DisplayName to TagDefinition from PolicySpecifiedDefinition --- .../Volo/CmsKit/PolicySpecifiedDefinition.cs | 5 ----- .../src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/TagDefiniton.cs | 6 +++++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/PolicySpecifiedDefinition.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/PolicySpecifiedDefinition.cs index 88fd6eb824..6105beab97 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/PolicySpecifiedDefinition.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/PolicySpecifiedDefinition.cs @@ -11,20 +11,15 @@ namespace Volo.CmsKit.Domain.Volo.CmsKit } public PolicySpecifiedDefinition( - [CanBeNull] ILocalizableString displayName = null, [CanBeNull] string createPolicy = null, [CanBeNull] string updatePolicy = null, [CanBeNull] string deletePolicy = null) { - DisplayName = displayName; CreatePolicy = createPolicy; DeletePolicy = deletePolicy; UpdatePolicy = updatePolicy; } - [CanBeNull] - public virtual ILocalizableString DisplayName { get; } - [CanBeNull] public virtual string CreatePolicy { get; set; } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/TagDefiniton.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/TagDefiniton.cs index 6ccff22f2c..6029ab3946 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/TagDefiniton.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/TagDefiniton.cs @@ -9,6 +9,9 @@ namespace Volo.CmsKit.Tags { public string EntityType { get; } + [CanBeNull] + public virtual ILocalizableString DisplayName { get; } + public TagDefiniton() { } @@ -18,10 +21,11 @@ namespace Volo.CmsKit.Tags [CanBeNull] ILocalizableString displayName = null, [CanBeNull] string createPolicy = null, [CanBeNull] string updatePolicy = null, - [CanBeNull] string deletePolicy = null) : base(displayName, createPolicy, updatePolicy, deletePolicy) + [CanBeNull] string deletePolicy = null) : base(createPolicy, updatePolicy, deletePolicy) { EntityType = Check.NotNullOrWhiteSpace(entityType, nameof(entityType)); + DisplayName = displayName; } } }