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] 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 @@
                         }
                     </div>
                 }
-                @if (CurrentUser.UserName == Model.Post.Writer?.UserName)
+                
+                @if (CurrentUser.Id.HasValue && CurrentUser.Id.Value == Model.Post.Writer?.Id)
                 {
                     <a class="fw-lighter" href="/Members/@Model.Post.Writer?.UserName#edit-profile">@L["EditProfile"] <i class="fas fa-edit"></i></a>
                 }
@@ -197,10 +198,11 @@
                                                             <img gravatar-email="@post.Writer.Email" default-image="Identicon" class="last-post-image" alt="User Avatar"/>
                                                         </a>
                                                     </div>
+                                                    
                                                     <div class="col">
                                                         <h5 class="last-post-name">
-                                                            <a href="/Members/@post.Writer?.UserName">
-                                                                @(post.Writer?.UserName)
+                                                            <a href="/Members/@post.Writer!.UserName">
+                                                                @(post.Writer!.UserName)
                                                             </a>
                                                         </h5>
                                                     </div>
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<PostWithDetailsDto>();
-            }
+            PostsList = Post.Writer != null
+                ? await _postAppService.GetListByUserIdAsync(Post.Writer.Id)
+                : new List<PostWithDetailsDto>();
 
             LatestPosts = await _postAppService.GetLatestBlogPostsAsync(Blog.Id, 5);
             CommentsWithReplies = await _commentAppService.GetHierarchicalListOfPostAsync(Post.Id);