Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: use separate site attribute for single category "top tags" list. 

And use it only in the single category pages.
38dd184a16
This commit is contained in:
Vinoth Kannan 2020-02-17 21:09:27 +05:30
parent 330d1ae9bc
commit 2e397c78c4
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/routes/build-topic-route.js.es6
View File

@ -67,7 +67,11 @@ function findTopicList(store, tracking, filter, filterParams, extras) {
}
Session.currentProp("topicList", list);
if (list.topic_list && list.topic_list.top_tags) {
Site.currentProp("top_tags", list.topic_list.top_tags);
if (list.filter.startsWith("c/")) {
Site.currentProp("category_top_tags", list.topic_list.top_tags);
} else {
Site.currentProp("top_tags", list.topic_list.top_tags);
}
}
return list;
});

14
app/assets/javascripts/select-kit/components/tag-drop.js.es6
View File

@ -107,7 +107,19 @@ export default ComboBoxComponent.extend(TagsMixin, {
return shortcuts;
}),
topTags: readOnly("site.top_tags.[]"),
topTags: computed(
"firstCategory",
"secondCategory",
"site.category_top_tags.[]",
"site.top_tags.[]",
function() {
if (this.currentCategory && this.site.category_top_tags) {
return this.site.category_top_tags;
}
return this.site.top_tags;
}
),
content: computed("topTags.[]", "shortcuts.[]", function() {
if (this.sortTagsAlphabetically && this.topTags) {