IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: keep tag filter value when changing the category dropdown. (#11065)

Browse Source 
Previously, while filtering the topics by tag, selecting a category loses the selected tag value.
This commit is contained in:
Vinoth Kannan 2020-10-30 06:26:20 +05:30 committed by GitHub
parent b2847e3753
commit 2d5bb516a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs
View File

@ -3,6 +3,7 @@
{{category-drop {{category-drop
category=breadcrumb.category category=breadcrumb.category
categories=breadcrumb.options categories=breadcrumb.options
tagId=tagId
options=(hash options=(hash
parentCategory=breadcrumb.parentCategory parentCategory=breadcrumb.parentCategory
subCategory=breadcrumb.isSubcategory subCategory=breadcrumb.isSubcategory

9
app/assets/javascripts/select-kit/addon/components/category-drop.js
View File

@ -161,7 +161,14 @@ export default ComboBoxComponent.extend({
onChange(categoryId) { onChange(categoryId) {
let categoryURL; let categoryURL;
if (categoryId === ALL_CATEGORIES_ID) { if (this.tagId && !this.category) {
const category = Category.findById(parseInt(categoryId, 10));
categoryURL = getURL(
`/tags/c/${Category.slugFor(category)}/${
category.id
}/${this.tagId.toLowerCase()}`
);
} else if (categoryId === ALL_CATEGORIES_ID) {
categoryURL = this.allCategoriesUrl; categoryURL = this.allCategoriesUrl;
} else if (categoryId === NO_CATEGORIES_ID) { } else if (categoryId === NO_CATEGORIES_ID) {
categoryURL = this.noCategoriesUrl; categoryURL = this.noCategoriesUrl;