github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-11 13:16:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: category id in filterCategory (#8555)

Browse Source 
Small regression was created here: https://github.com/discourse/discourse/commit/374534f00ee#diff-4af46675500edc092f9224ca5835a7ddR106

After that change `listFilter` is including `categoryId` like `c/cat/subcat/6/l/latest` instead of `c/cat/subcat/l/latest`

Therefore, `trackIncoming` function in topic-tracking-state couldn't properly filter new messages
This commit is contained in:
Krzysztof Kotlarek
2019-12-17 08:33:38 +11:00
committed by GitHub
parent 998bbdc40f
commit 84ede5867c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
View File

@ -221,9 +221,9 @@ const TopicTrackingState = EmberObject.extend({
if (split.length >= 4) { if (split.length >= 4) {
filter = split[split.length - 1]; filter = split[split.length - 1];
// c/cat/subcat/l/latest // c/cat/subcat/6/l/latest
var category = Category.findSingleBySlug( var category = Category.findSingleBySlug(
split.splice(1, split.length - 3).join("/") split.splice(1, split.length - 4).join("/")
); );
this.set("filterCategory", category); this.set("filterCategory", category);
} else { } else {

4
test/javascripts/models/topic-tracking-state-test.js.es6
View File

@ -42,7 +42,7 @@ QUnit.test("subscribe to category", function(assert) {
const state = TopicTrackingState.create(); const state = TopicTrackingState.create();
state.trackIncoming("c/darth/l/latest"); state.trackIncoming("c/darth/1/l/latest");
state.notify({ state.notify({
message_type: "new_topic", message_type: "new_topic",
@ -67,7 +67,7 @@ QUnit.test("subscribe to category", function(assert) {
); );
state.resetTracking(); state.resetTracking();
state.trackIncoming("c/darth/luke/l/latest"); state.trackIncoming("c/darth/luke/2/l/latest");
state.notify({ state.notify({
message_type: "new_topic", message_type: "new_topic",