fix: use setting to hide/show excerpt

flarum · Oct 21, 2024 · dad63e9 · dad63e9
1 parent f75329f
commit dad63e9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/extensions/sticky/js/src/admin/extend.tsx b/extensions/sticky/js/src/admin/extend.tsx
@@ -15,11 +15,22 @@ export default [
       'moderate',
       95
     )
-    .setting(() => ({
-      setting: 'flarum-sticky.only_sticky_unread_discussions',
-      name: 'onlyStickyUnreadDiscussions',
-      type: 'boolean',
-      label: app.translator.trans('flarum-sticky.admin.settings.only_sticky_unread_discussions_label'),
-      help: app.translator.trans('flarum-sticky.admin.settings.only_sticky_unread_discussions_help'),
-    })),
+    .setting(
+      () => ({
+        setting: 'flarum-sticky.only_sticky_unread_discussions',
+        name: 'onlyStickyUnreadDiscussions',
+        type: 'boolean',
+        label: app.translator.trans('flarum-sticky.admin.settings.only_sticky_unread_discussions_label'),
+        help: app.translator.trans('flarum-sticky.admin.settings.only_sticky_unread_discussions_help'),
+      }),
+      90
+    )
+    .setting(
+      () => ({
+        type: 'switch',
+        setting: 'flarum-sticky.enable_display_excerpt',
+        label: app.translator.trans('flarum-sticky.admin.settings.enable_display_excerpt'),
+      }),
+      100
+    ),
 ];
diff --git a/extensions/sticky/js/src/forum/addStickyExcerpt.js b/extensions/sticky/js/src/forum/addStickyExcerpt.js
@@ -16,7 +16,7 @@ export default function addStickyExcerpt() {
   extend(DiscussionListItem.prototype, 'infoItems', function (items) {
     const discussion = this.attrs.discussion;
 
-    if (discussion.isSticky() && !this.attrs.params.q && !discussion.lastReadPostNumber()) {
+    if (app.forum.attribute('excerptDisplayEnabled') && discussion.isSticky() && !this.attrs.params.q && !discussion.lastReadPostNumber()) {
       const firstPost = discussion.firstPost();
 
       if (firstPost) {

diff --git a/extensions/sticky/locale/en.yml b/extensions/sticky/locale/en.yml
@@ -7,16 +7,14 @@ flarum-sticky:
   # Translations in this namespace are used by the admin interface.
   admin:
     settings:
+      enable_display_excerpt: Show an excerpt of the first post when a sticky discussion is unread
       only_sticky_unread_discussions_label: Only sticky unread discussions
       only_sticky_unread_discussions_help: On the All Discussions page, unread sticky discussions pin to the top, while read sticky discussions follow the regular order.
 
     # These translations are used in the Permissions page of the admin interface.
     permissions:
       sticky_discussions_label: Sticky discussions
 
-    settings:
-      enable_display_excerpt: Show an excerpt of the first post when a sticky discussion is unread
-
   # Translations in this namespace are used by the forum user interface.
   forum: