From 6f27ff2998147fd365cfb8a62285cca5af909fea Mon Sep 17 00:00:00 2001 From: Jan Cernik <66427541+jancernik@users.noreply.github.com> Date: Sat, 1 Jun 2024 12:26:03 -0300 Subject: [PATCH] FIX: Show the solved filter on tags (#296) --- .../connectors/bread-crumbs-right/solved-status-filter.js | 8 +++++--- assets/stylesheets/solutions.scss | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/assets/javascripts/discourse/connectors/bread-crumbs-right/solved-status-filter.js b/assets/javascripts/discourse/connectors/bread-crumbs-right/solved-status-filter.js index 375cf52..0423cf8 100644 --- a/assets/javascripts/discourse/connectors/bread-crumbs-right/solved-status-filter.js +++ b/assets/javascripts/discourse/connectors/bread-crumbs-right/solved-status-filter.js @@ -25,7 +25,10 @@ export default class SolvedStatusFilter extends Component { args.editingCategory ) { return false; - } else if (helper.siteSettings.allow_solved_on_all_topics) { + } else if ( + helper.siteSettings.allow_solved_on_all_topics || + router.currentRouteName === "tag.show" + ) { return true; } else { return args.currentCategory?.enable_accepted_answers; @@ -45,8 +48,7 @@ export default class SolvedStatusFilter extends Component { } get status() { - const queryParamValue = - this.router.currentRoute.attributes?.modelParams?.solved; + const queryParamValue = this.router.currentRoute.queryParams?.solved; return UX_VALUES[queryParamValue] || "all"; } diff --git a/assets/stylesheets/solutions.scss b/assets/stylesheets/solutions.scss index b6af371..11d183f 100644 --- a/assets/stylesheets/solutions.scss +++ b/assets/stylesheets/solutions.scss @@ -5,7 +5,7 @@ $solved-color: green; min-width: auto; margin-right: 0.5em; .select-kit-header { - margin: 0; + color: var(--primary-high); } } }