diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210305104055_BlogPost_CoverImage.Designer.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210305122554_BlogPost_CoverImage.Designer.cs similarity index 99% rename from modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210305104055_BlogPost_CoverImage.Designer.cs rename to modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210305122554_BlogPost_CoverImage.Designer.cs index 506e8cf2db..5fc4f4221d 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210305104055_BlogPost_CoverImage.Designer.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210305122554_BlogPost_CoverImage.Designer.cs @@ -11,7 +11,7 @@ using Volo.CmsKit.EntityFrameworkCore; namespace Volo.CmsKit.Migrations { [DbContext(typeof(UnifiedDbContext))] - [Migration("20210305104055_BlogPost_CoverImage")] + [Migration("20210305122554_BlogPost_CoverImage")] partial class BlogPost_CoverImage { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -1275,7 +1275,7 @@ namespace Volo.CmsKit.Migrations .HasMaxLength(2147483647) .HasColumnType("nvarchar(max)"); - b.Property("CoverImage") + b.Property("CoverImageMediaId") .HasColumnType("uniqueidentifier"); b.Property("CreationTime") diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210305104055_BlogPost_CoverImage.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210305122554_BlogPost_CoverImage.cs similarity index 96% rename from modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210305104055_BlogPost_CoverImage.cs rename to modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210305122554_BlogPost_CoverImage.cs index 4e68ebb210..4345b9ec88 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210305104055_BlogPost_CoverImage.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210305122554_BlogPost_CoverImage.cs @@ -11,7 +11,7 @@ namespace Volo.CmsKit.Migrations name: "CmsContents"); migrationBuilder.AddColumn( - name: "CoverImage", + name: "CoverImageMediaId", table: "CmsBlogPosts", type: "uniqueidentifier", nullable: true); @@ -20,7 +20,7 @@ namespace Volo.CmsKit.Migrations protected override void Down(MigrationBuilder migrationBuilder) { migrationBuilder.DropColumn( - name: "CoverImage", + name: "CoverImageMediaId", table: "CmsBlogPosts"); migrationBuilder.CreateTable( diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs index bd046eeb03..ad5c7ef888 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs @@ -1273,7 +1273,7 @@ namespace Volo.CmsKit.Migrations .HasMaxLength(2147483647) .HasColumnType("nvarchar(max)"); - b.Property("CoverImage") + b.Property("CoverImageMediaId") .HasColumnType("uniqueidentifier"); b.Property("CreationTime") diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/BlogPostDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/BlogPostDto.cs index 66c9b9ac95..20e573bac1 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/BlogPostDto.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/BlogPostDto.cs @@ -16,6 +16,6 @@ namespace Volo.CmsKit.Admin.Blogs public string Content { get; set; } - public Guid? CoverImage { get; set; } + public Guid? CoverImageMediaId { get; set; } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/CreateBlogPostDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/CreateBlogPostDto.cs index 39486ab356..1cae41512c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/CreateBlogPostDto.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/CreateBlogPostDto.cs @@ -25,6 +25,6 @@ namespace Volo.CmsKit.Admin.Blogs [DynamicMaxLength(typeof(BlogPostConsts), nameof(BlogPostConsts.MaxContentLength))] public string Content { get; set; } - public Guid? CoverImage { get; set; } + public Guid? CoverImageMediaId { get; set; } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/UpdateBlogPostDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/UpdateBlogPostDto.cs index f4ed8aea5d..d0619288fe 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/UpdateBlogPostDto.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/UpdateBlogPostDto.cs @@ -22,6 +22,6 @@ namespace Volo.CmsKit.Admin.Blogs [DynamicMaxLength(typeof(BlogPostConsts), nameof(BlogPostConsts.MaxContentLength))] public string Content { get; set; } - public Guid? CoverImage { get; set; } + public Guid? CoverImageMediaId { get; set; } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogPostAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogPostAdminAppService.cs index 38b2b7a3b5..1d273f6a9c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogPostAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogPostAdminAppService.cs @@ -51,7 +51,7 @@ namespace Volo.CmsKit.Admin.Blogs input.Slug, input.ShortDescription, input.Content, - input.CoverImage); + input.CoverImageMediaId); await BlogPostRepository.InsertAsync(blogPost); @@ -66,7 +66,7 @@ namespace Volo.CmsKit.Admin.Blogs blogPost.SetTitle(input.Title); blogPost.SetShortDescription(input.ShortDescription); blogPost.SetContent(input.Content); - blogPost.CoverImage = input.CoverImage; + blogPost.CoverImageMediaId = input.CoverImageMediaId; if (blogPost.Slug != input.Slug) { diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml.cs index 2774b0528b..7b6680c3c2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml.cs @@ -64,7 +64,7 @@ namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.BlogPosts public string Content { get; set; } [HiddenInput] - public Guid? CoverImage { get; set; } + public Guid? CoverImageMediaId { get; set; } } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml index b4386af860..7a2ecab760 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml @@ -45,7 +45,7 @@
- +
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml.cs index 69d29fff8f..e862c34d43 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml.cs @@ -78,7 +78,7 @@ namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.BlogPosts public string Content { get; set; } [HiddenInput] - public Guid? CoverImage { get; set; } + public Guid? CoverImageMediaId { get; set; } } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js index e4225aa3dc..378ab3f4da 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js @@ -6,7 +6,7 @@ var $formCreate = $('#form-blog-post-create'); var $title = $('#ViewModel_Title'); var $shortDescription = $('#ViewModel_ShortDescription'); - var $coverImage = $('#ViewModel_CoverImage'); + var $coverImage = $('#ViewModel_CoverImageMediaId'); var $url = $('#ViewModel_Slug'); var $buttonSubmit = $('#button-blog-post-create'); var $pageContentInput = $('#ViewModel_Content'); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js index 867aa158e7..84754bd316 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js @@ -4,7 +4,7 @@ var $selectBlog = $('#BlogSelectionSelect'); var $formUpdate = $('#form-blog-post-update'); - var $coverImage = $('#ViewModel_CoverImage'); + var $coverImage = $('#ViewModel_CoverImageMediaId'); var $slug = $('#ViewModel_Slug'); var $buttonSubmit = $('#button-blog-post-update'); var $blogPostIdInput = $('#Id'); diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPost.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPost.cs index c1e5bba2d9..7dda50ca9a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPost.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPost.cs @@ -23,7 +23,7 @@ namespace Volo.CmsKit.Blogs public virtual string Content { get; protected set; } - public Guid? CoverImage { get; set; } + public Guid? CoverImageMediaId { get; set; } public virtual Guid? TenantId { get; protected set; } @@ -43,7 +43,7 @@ namespace Volo.CmsKit.Blogs [NotNull] string slug, [CanBeNull] string shortDescription = null, [CanBeNull] string content = null, - [CanBeNull] Guid? coverImage = null, + [CanBeNull] Guid? coverImageMediaId = null, [CanBeNull] Guid? tenantId = null) : base(id) { TenantId = tenantId; @@ -53,7 +53,7 @@ namespace Volo.CmsKit.Blogs SetSlug(slug); SetShortDescription(shortDescription); SetContent(content); - CoverImage = coverImage; + CoverImageMediaId = coverImageMediaId; } public virtual void SetTitle(string title) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPostManager.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPostManager.cs index bf5e9ef936..cce076b74b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPostManager.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPostManager.cs @@ -28,7 +28,7 @@ namespace Volo.CmsKit.Blogs [NotNull] string slug, [CanBeNull] string shortDescription = null, [CanBeNull] string content = null, - [CanBeNull] Guid? coverImage = null) + [CanBeNull] Guid? coverImageMediaId = null) { Check.NotNull(author, nameof(author)); Check.NotNull(blog, nameof(blog)); @@ -45,7 +45,7 @@ namespace Volo.CmsKit.Blogs slug, shortDescription, content, - coverImage, + coverImageMediaId, CurrentTenant.Id ); diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/BlogPostPublicDto.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/BlogPostPublicDto.cs index 3b762227e3..b2b3cc88e0 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/BlogPostPublicDto.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/BlogPostPublicDto.cs @@ -17,7 +17,7 @@ namespace Volo.CmsKit.Public.Blogs public string Content { get; set; } - public Guid? CoverImage { get; set; } + public Guid? CoverImageMediaId { get; set; } public CmsUserDto Author { get; set; } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml index 282f8f36cb..46f7749d8b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml @@ -9,7 +9,7 @@ } - + @Model.Title @Model.Author?.UserName diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml index 61bf30b8a0..b58e6d1543 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml @@ -25,9 +25,9 @@ - @if (blog.CoverImage != null) + @if (blog.CoverImageMediaId != null) { - + } else {