From ddd04b8e5f4fc395e345b0ed5ab0f78eeb4f9f78 Mon Sep 17 00:00:00 2001 From: Salih Date: Mon, 5 Jun 2023 08:31:17 +0300 Subject: [PATCH 1/2] The detail page should not give an error if a post is without an author --- .../Pages/Blogs/Posts/Detail.cshtml | 66 ++++++++++--------- .../Pages/Blogs/Posts/Detail.cshtml.cs | 10 ++- 2 files changed, 44 insertions(+), 32 deletions(-) diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml index 1ebf445f05..d2746284ba 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml @@ -147,27 +147,31 @@ }
-
- - @if (Model.Post.Writer.Name != null && Model.Post.Writer.Surname != null) - { -

@Model.Post.Writer.Name @Model.Post.Writer.Surname

- } - else + @if (Model.Post.Writer != null) + { +
+ + + @if (Model.Post.Writer.Name != null && Model.Post.Writer.Surname != null) + { +

@Model.Post.Writer.Name @Model.Post.Writer.Surname

+ } + else + { +

@Model.Post.Writer.UserName

+ } + +
+
+ @if (Model.Post.Writer.JobTitle != null) { -

@Model.Post.Writer.UserName

+

@Model.Post.Writer.JobTitle

} - -
-
- @if (Model.Post.Writer.JobTitle != null) - { -

@Model.Post.Writer.JobTitle

- } -
- @if (CurrentUser.UserName == Model.Post.Writer.UserName) +
+ } + @if (CurrentUser.UserName == Model.Post.Writer?.UserName) { - @L["EditProfile"] + @L["EditProfile"] } @if (Model.LatestPosts.Count > 1) @@ -185,23 +189,23 @@
-
-
- @if (post.Writer != null) - { + @if (post.Writer != null) + { +
+
User Avatar - } -
-
-
- - @(post.Writer.UserName) - -
+
+
+
+ + @(post.Writer?.UserName) + +
+
-
+ }
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs index 54d1a4e71d..b200266f0c 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs @@ -86,7 +86,15 @@ namespace Volo.Blogging.Pages.Blog.Posts { Blog = await _blogAppService.GetByShortNameAsync(BlogShortName); Post = await _postAppService.GetForReadingAsync(new GetPostInput { BlogId = Blog.Id, Url = PostUrl }); - PostsList = await _postAppService.GetListByUserIdAsync(Post.Writer.Id); + + if (Post.Writer != null) + { + PostsList = await _postAppService.GetListByUserIdAsync(Post.Writer.Id); + }else + { + PostsList = new List(); + } + LatestPosts = await _postAppService.GetLatestBlogPostsAsync(Blog.Id, 5); CommentsWithReplies = await _commentAppService.GetHierarchicalListOfPostAsync(Post.Id); CountComments(); From cd74de69c42599f027507bfac716c18f236b98da Mon Sep 17 00:00:00 2001 From: Engincan VESKE <43685404+EngincanV@users.noreply.github.com> Date: Mon, 5 Jun 2023 09:32:29 +0300 Subject: [PATCH 2/2] Refactor #16746 --- .../Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml | 8 +++++--- .../Pages/Blogs/Posts/Detail.cshtml.cs | 10 +++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml index d2746284ba..cc37c15c89 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml @@ -169,7 +169,8 @@ }
} - @if (CurrentUser.UserName == Model.Post.Writer?.UserName) + + @if (CurrentUser.Id.HasValue && CurrentUser.Id.Value == Model.Post.Writer?.Id) { @L["EditProfile"] } @@ -197,10 +198,11 @@ User Avatar
+
- - @(post.Writer?.UserName) + + @(post.Writer!.UserName)
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs index b200266f0c..114bdbb641 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs @@ -87,13 +87,9 @@ namespace Volo.Blogging.Pages.Blog.Posts Blog = await _blogAppService.GetByShortNameAsync(BlogShortName); Post = await _postAppService.GetForReadingAsync(new GetPostInput { BlogId = Blog.Id, Url = PostUrl }); - if (Post.Writer != null) - { - PostsList = await _postAppService.GetListByUserIdAsync(Post.Writer.Id); - }else - { - PostsList = new List(); - } + PostsList = Post.Writer != null + ? await _postAppService.GetListByUserIdAsync(Post.Writer.Id) + : new List(); LatestPosts = await _postAppService.GetLatestBlogPostsAsync(Blog.Id, 5); CommentsWithReplies = await _commentAppService.GetHierarchicalListOfPostAsync(Post.Id);