From f82f8f1f8f2bac5b78f95848a49eab4e184b1dcf Mon Sep 17 00:00:00 2001 From: enisn Date: Wed, 24 Feb 2021 13:34:02 +0300 Subject: [PATCH] CmsKit - Remove FeatureNames from BlogPostConsts --- .../Volo/CmsKit/Blogs/BlogPostConsts.cs | 8 -------- .../Volo/CmsKit/Blogs/DefaultBlogFeatureProvider.cs | 9 +++++---- .../Pages/CmsKit/Blogs/BlogPost.cshtml.cs | 8 ++++---- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Blogs/BlogPostConsts.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Blogs/BlogPostConsts.cs index 7d24f76d09..7e1de6e7c0 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Blogs/BlogPostConsts.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Blogs/BlogPostConsts.cs @@ -13,13 +13,5 @@ namespace Volo.CmsKit.Blogs public static int MaxShortDescriptionLength { get; set; } = 256; public const string EntityType = "BlogPost"; - - public const string CommentsFeatureName = CommentsFeature.Name; - - public const string ReactionsFeatureName = ReactionsFeature.Name; - - public const string RatingsFeatureName = RatingsFeature.Name; - - public const string TagsFeatureName = TagsFeature.Name; } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/DefaultBlogFeatureProvider.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/DefaultBlogFeatureProvider.cs index b72ea6bd72..0504bdaf93 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/DefaultBlogFeatureProvider.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/DefaultBlogFeatureProvider.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Volo.Abp.DependencyInjection; +using Volo.CmsKit.GlobalFeatures; namespace Volo.CmsKit.Blogs { @@ -11,10 +12,10 @@ namespace Volo.CmsKit.Blogs { return Task.FromResult(new List { - new BlogFeature(blogId, BlogPostConsts.CommentsFeatureName), - new BlogFeature(blogId, BlogPostConsts.ReactionsFeatureName), - new BlogFeature(blogId, BlogPostConsts.RatingsFeatureName), - new BlogFeature(blogId, BlogPostConsts.TagsFeatureName), + new BlogFeature(blogId, CommentsFeature.Name), + new BlogFeature(blogId, ReactionsFeature.Name), + new BlogFeature(blogId, RatingsFeature.Name), + new BlogFeature(blogId, TagsFeature.Name), }); } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml.cs index bf10548027..896ca37d67 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml.cs @@ -48,22 +48,22 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Blogs if (GlobalFeatureManager.Instance.IsEnabled()) { - CommentsFeature = await BlogFeatureAppService.GetOrDefaultAsync(BlogPost.BlogId, BlogPostConsts.CommentsFeatureName); + CommentsFeature = await BlogFeatureAppService.GetOrDefaultAsync(BlogPost.BlogId, GlobalFeatures.CommentsFeature.Name); } if (GlobalFeatureManager.Instance.IsEnabled()) { - ReactionsFeature = await BlogFeatureAppService.GetOrDefaultAsync(BlogPost.BlogId, BlogPostConsts.ReactionsFeatureName); + ReactionsFeature = await BlogFeatureAppService.GetOrDefaultAsync(BlogPost.BlogId, GlobalFeatures.ReactionsFeature.Name); } if (GlobalFeatureManager.Instance.IsEnabled()) { - RatingsFeature = await BlogFeatureAppService.GetOrDefaultAsync(BlogPost.BlogId, BlogPostConsts.RatingsFeatureName); + RatingsFeature = await BlogFeatureAppService.GetOrDefaultAsync(BlogPost.BlogId, GlobalFeatures.RatingsFeature.Name); } if (GlobalFeatureManager.Instance.IsEnabled()) { - TagsFeature = await BlogFeatureAppService.GetOrDefaultAsync(BlogPost.BlogId, BlogPostConsts.TagsFeatureName); + TagsFeature = await BlogFeatureAppService.GetOrDefaultAsync(BlogPost.BlogId, GlobalFeatures.TagsFeature.Name); } } }