diff --git a/extend.php b/extend.php index fa0df14..5f6ac4e 100644 --- a/extend.php +++ b/extend.php @@ -89,13 +89,12 @@ ->default('fof-best-answer.store_log_output', false) ->default('fof-best-answer.enabled-tags', '[]') ->default('fof-best-answer.search.solution_search', true) + ->default('fof-best-answer.search.display_tags', true) ->default('fof-best-answer.discussion_sidebar_jump_button', false) - ->serializeToForum('canSelectBestAnswerOwnPost', 'fof-best-answer.allow_select_own_post', 'boolVal') - ->serializeToForum('useAlternativeBestAnswerUi', 'fof-best-answer.use_alternative_ui', 'boolVal') - ->serializeToForum('showBestAnswerFilterUi', 'fof-best-answer.show_filter_dropdown', 'boolVal') - ->serializeToForum('fof-best-answer.show_max_lines', 'fof-best-answer.show_max_lines', 'intVal') - ->serializeToForum('solutionSearchEnabled', 'fof-best-answer.search.solution_search', 'boolVal') - ->serializeToForum('bestAnswerDiscussionSidebarJumpButton', 'fof-best-answer.discussion_sidebar_jump_button', 'boolVal'), + ->serializeToForum('fof-best-answer.show_max_lines', 'fof-best-answer.show_max_lines', 'intVal'), + + (new Extend\ApiSerializer(Serializer\ForumSerializer::class)) + ->attributes(ForumAttributes::class), (new Extend\ApiController(ShowDiscussionController::class)) ->addInclude(['bestAnswerPost', 'bestAnswerUser']) diff --git a/js/src/admin/components/BestAnswerSettingsPage.tsx b/js/src/admin/components/BestAnswerSettingsPage.tsx index 29f7a07..bab1dc5 100644 --- a/js/src/admin/components/BestAnswerSettingsPage.tsx +++ b/js/src/admin/components/BestAnswerSettingsPage.tsx @@ -84,6 +84,12 @@ export default class BestAnswerSettingsPage extends ExtensionPage { label: app.translator.trans('fof-best-answer.admin.settings.solution_search'), help: app.translator.trans('fof-best-answer.admin.settings.solution_search_help'), })} + {this.buildSettingComponent({ + type: 'boolean', + setting: 'fof-best-answer.search.display_tags', + label: app.translator.trans('fof-best-answer.admin.settings.display_tags'), + help: app.translator.trans('fof-best-answer.admin.settings.display_tags_help'), + })}
diff --git a/js/src/forum/components/SolutionSearchItem.tsx b/js/src/forum/components/SolutionSearchItem.tsx
index 0852078..a474442 100644
--- a/js/src/forum/components/SolutionSearchItem.tsx
+++ b/js/src/forum/components/SolutionSearchItem.tsx
@@ -59,7 +59,8 @@ export default class SolutionSearchItem extends Component