From f519834824641e6147075594398944bf79abc3bb Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Fri, 8 Jan 2016 11:26:06 +0800
Subject: [PATCH] FIX: Don't include child categories when term is black.

---
 .../discourse/models/category.js.es6           |  2 +-
 test/javascripts/models/category-test.js.es6   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6
index 45fb9bb0ba..e507419c0e 100644
--- a/app/assets/javascripts/discourse/models/category.js.es6
+++ b/app/assets/javascripts/discourse/models/category.js.es6
@@ -311,7 +311,7 @@ Category.reopenClass({
 
     for (i = 0; i < length && !done(); i++) {
       const category = categories[i];
-      if ((emptyTerm) ||
+      if ((emptyTerm && !category.get('parent_category_id')) ||
           (!emptyTerm && category.get('name').toLowerCase().indexOf(term) === 0)) {
         data.push(category);
       }
diff --git a/test/javascripts/models/category-test.js.es6 b/test/javascripts/models/category-test.js.es6
index 7b6a8c3703..157e319189 100644
--- a/test/javascripts/models/category-test.js.es6
+++ b/test/javascripts/models/category-test.js.es6
@@ -149,25 +149,25 @@ test('search', () => {
 
   sandbox.restore();
 
-  const category3 = store.createRecord('category', { id: 3, name: 'term start', parent_category_id: category1.get('id') }),
-        category4 = store.createRecord('category', { id: 4, name: 'some term', read_restricted: true });
+  const child_category1 = store.createRecord('category', { id: 3, name: 'term start', parent_category_id: category1.get('id') }),
+        read_restricted_category = store.createRecord('category', { id: 4, name: 'some term', read_restricted: true });
 
-  sandbox.stub(Category, "listByActivity").returns([category4, category1, category3, category2]);
+  sandbox.stub(Category, "listByActivity").returns([read_restricted_category, category1, child_category1, category2]);
 
   deepEqual(result(''),
-            [category1.get('id'), category3.get('id'), category2.get('id'), category4.get('id')],
-            "prioritize non read_restricted categories when term is blank");
+            [category1.get('id'), category2.get('id'), read_restricted_category.get('id')],
+            "prioritize non read_restricted and does not include child categories when term is blank");
 
   deepEqual(result('', { limit: 3 }),
-            [category1.get('id'), category3.get('id'), category4.get('id')],
-            "prioritize non read_restricted categories when term is blank with limit");
+            [category1.get('id'), category2.get('id'), read_restricted_category.get('id')],
+            "prioritize non read_restricted and does not include child categories categories when term is blank with limit");
 
   deepEqual(result('term'),
-            [category3.get('id'), category2.get('id'), category1.get('id'), category4.get('id')],
+            [child_category1.get('id'), category2.get('id'), category1.get('id'), read_restricted_category.get('id')],
             "prioritize non read_restricted");
 
   deepEqual(result('term', { limit: 3 }),
-            [category3.get('id'), category2.get('id'), category4.get('id')],
+            [child_category1.get('id'), category2.get('id'), read_restricted_category.get('id')],
             "prioritize non read_restricted with limit");
 
   sandbox.restore();