From a5a15974045fbd22d71c422ce0d48b62621ebd43 Mon Sep 17 00:00:00 2001
From: "1152958806@qq.com" <1152958806@qq.com>
Date: Wed, 16 Oct 2024 23:47:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E8=BE=91=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=20=E8=A7=A3=E5=86=B3=E6=A0=87=E7=AD=BE=E6=A0=8F=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=A9=BA=E7=99=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/modules/sidebar.html                    |  3 +--
 .../widgets/aside/contain/tags-contain.html       |  3 +--
 templates/modules/widgets/aside/recent-posts.html |  2 +-
 templates/modules/widgets/aside/visit-posts.html  |  2 +-
 templates/modules/widgets/console.html            |  5 ++---
 templates/post.html                               | 15 +++++++++------
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/templates/modules/sidebar.html b/templates/modules/sidebar.html
index dc88a4cc..1bad0fdc 100644
--- a/templates/modules/sidebar.html
+++ b/templates/modules/sidebar.html
@@ -61,12 +61,11 @@
         </th:block>
         <span class="sidebar-menu-item-title">标签</span>
         <div class="card-widget card-tags card-archives card-webinfo card-allinfo"
-             th:with="tags = ${tagFinder.listAll()}, tagQuantity = ${#conversions.convert(theme.config.sidebar.tagQuantity, 'java.lang.Integer')}">
+             th:with="tags = ${tagFinder.list(1,theme.config.sidebar.tagQuantity)}">
             <div class="item-headline"></div>
             <div class="card-tag-cloud">
                 <a class="tag-item" style="font-size:1em" th:each="tag,iterStat : ${tags}"
                    th:href="@{${tag.status.permalink}}"
-                   th:if="${tagQuantity >= 0 && iterStat.index < tagQuantity || tagQuantity < 0}"
                    th:title="${tag.spec.displayName}">
                     <!-- 角标 -->
                     [[${tag.spec.displayName}]]<sup th:text="${tag.status.visiblePostCount}"></sup>
diff --git a/templates/modules/widgets/aside/contain/tags-contain.html b/templates/modules/widgets/aside/contain/tags-contain.html
index 27eedb1e..ee4840b5 100644
--- a/templates/modules/widgets/aside/contain/tags-contain.html
+++ b/templates/modules/widgets/aside/contain/tags-contain.html
@@ -1,12 +1,11 @@
 <!-- 标签 -->
 <th:block
-          th:with="tags = ${tagFinder.listAll()}, tagQuantity = ${#conversions.convert(theme.config.sidebar.tagQuantity, 'java.lang.Integer')}">
+          th:with="tags = ${tagFinder.list(1,theme.config.sidebar.tagQuantity)}">
 
     <div class="item-headline"></div>
     <div class="card-tag-cloud">
         <a class="tag-item" style="font-size:1em" th:each="tag,iterStat : ${tags}"
            th:href="@{${tag.status.permalink}}"
-           th:if="${tagQuantity >= 0 && iterStat.index < tagQuantity || tagQuantity < 0}"
            th:title="${tag.spec.displayName}">
             <!-- 角标 -->
             [[${tag.spec.displayName}]]<sup th:text="${tag.status.visiblePostCount}"></sup>
diff --git a/templates/modules/widgets/aside/recent-posts.html b/templates/modules/widgets/aside/recent-posts.html
index cbf24248..9383aab0 100644
--- a/templates/modules/widgets/aside/recent-posts.html
+++ b/templates/modules/widgets/aside/recent-posts.html
@@ -3,7 +3,7 @@
     <div class="item-headline"><i class="haofont hao-icon-eicon_map-2-line1"></i><span>最近发布</span></div>
     <div class="aside-list">
         <!-- 最新文章，用户可以自定义展示数量 -->
-        <div class="aside-list-item" th:each="post : ${postFinder.list({page: 1, size: #conversions.convert(theme.config.sidebar.recentPost, 'java.lang.Integer'), sort: {'spec.publishTime,desc'}})}">
+        <div class="aside-list-item" th:each="post : ${postFinder.list({page: 1, size: theme.config.sidebar.recentPost, sort: {'spec.publishTime,desc'}})}">
             <a class="thumbnail" th:href="@{${post.status.permalink}}" th:title="${post.spec.title}">
                 <img th:alt="${post.spec.title}"
                      th:with="img = ${#strings.isEmpty(post.spec.cover) ? postRandomImg+post.spec.title : thumbnail.gen(post.spec.cover, 's')}"
diff --git a/templates/modules/widgets/aside/visit-posts.html b/templates/modules/widgets/aside/visit-posts.html
index 1f4306cb..ddad65ea 100644
--- a/templates/modules/widgets/aside/visit-posts.html
+++ b/templates/modules/widgets/aside/visit-posts.html
@@ -3,7 +3,7 @@
     <div class="item-headline"><i class="haofont hao-icon-eicon_map-2-line1"></i><span>热门文章</span></div>
     <div class="aside-list">
         <!-- 热门文章，用户可以自定义展示数量 -->
-        <div class="aside-list-item" th:each="post : ${postFinder.list({page: 1, size: #conversions.convert(theme.config.sidebar.recentPost, 'java.lang.Integer'), sort: {'stats.visit,desc'}})}">
+        <div class="aside-list-item" th:each="post : ${postFinder.list({page: 1, size: theme.config.sidebar.recentPost, sort: {'stats.visit,desc'}})}">
             <a class="thumbnail" th:href="@{${post.status.permalink}}" th:title="${post.spec.title}">
                 <img th:alt="${post.spec.title}"
                      th:with="img = ${#strings.isEmpty(post.spec.cover) ? postRandomImg+post.spec.title : thumbnail.gen(post.spec.cover, 's')}"
diff --git a/templates/modules/widgets/console.html b/templates/modules/widgets/console.html
index 67034571..bed4c746 100644
--- a/templates/modules/widgets/console.html
+++ b/templates/modules/widgets/console.html
@@ -50,11 +50,10 @@
           <div class="author-content-item-tips">标签</div>
           <span class="author-content-item-title">寻找感兴趣的领域</span>
         </div>
-        <div class="card-tag-cloud" th:with="tags = ${tagFinder.listAll()}, tagQuantity = ${#conversions.convert(theme.config.sidebar.tagQuantity, 'java.lang.Integer')}">
+        <div class="card-tag-cloud" th:with="tags = ${tagFinder.list(1,theme.config.sidebar.tagQuantity)}">
           <a style="font-size:1em;color:#d3d3d3"
              th:each="tag,iterStat : ${tags}"
-             th:href="@{${tag.status.permalink}}"
-             th:if="${tagQuantity >= 0 && iterStat.index < tagQuantity || tagQuantity < 0}">
+             th:href="@{${tag.status.permalink}}">
             [[${tag.spec.displayName}]]<sup th:text="${tag.status.visiblePostCount}"></sup>
           </a>
         </div>
diff --git a/templates/post.html b/templates/post.html
index 6836a70d..cebfe330 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -120,12 +120,15 @@ <h1 class="post-title" th:text="${post.spec.title}"></h1>
                                 <i class="haofont hao-icon-spinner fa-spin"></i>
                             </span>
                         </a>
-                        <a class="post-meta-editor" sec:authorize="isAuthenticated()" data-flag-title="编辑文章"
-                           title="编辑文章"
-                           th:attr="onclick='javascript:window.open(\''+ '/console/posts/editor?name='+${post.metadata.name}+'&returnToView=true\''+ ',' +'\'_self'+'\')'">
-                            <i style="margin-top: 2px;" class="haofont hao-icon-bianji post-meta-icon"></i>
-                            <span>编辑</span>
-                        </a>
+                        <th:block th:with="contributorLogin = ${contributorFinder.getContributor(#authentication.name)}">
+                            <a class="post-meta-editor" sec:authorize="isAuthenticated()" data-flag-title="编辑文章"
+                               title="编辑文章"
+                               th:if="${contributorLogin.name} == ${post.spec.owner}"
+                               th:attr="onclick='javascript:window.open(\''+ '/console/posts/editor?name='+${post.metadata.name}+'&returnToView=true\''+ ',' +'\'_self'+'\')'">
+                                <i style="margin-top: 2px;" class="haofont hao-icon-bianji post-meta-icon"></i>
+                                <span>编辑</span>
+                            </a>
+                        </th:block>
                     </div>
 
                 </div>