From 5dd890eb3df11cc8aaf3601969141b315025fcca Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 21 Nov 2017 15:38:30 +0100
Subject: [PATCH] FIX: displayCategoryDescription was not working correctly

---
 .../select-kit/components/category-row.js.es6      | 14 +++++++++++---
 .../select-kit/components/category-selector.js.es6 |  8 ++++----
 .../search-advanced-category-chooser.js.es6        |  8 ++++++++
 .../templates/components/category-row.hbs          |  2 +-
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/category-row.js.es6 b/app/assets/javascripts/select-kit/components/category-row.js.es6
index b3470102296..da59a4cfe99 100644
--- a/app/assets/javascripts/select-kit/components/category-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-row.js.es6
@@ -6,7 +6,15 @@ import { categoryBadgeHTML } from "discourse/helpers/category-link";
 export default SelectKitRowComponent.extend({
   layoutName: "select-kit/templates/components/category-row",
   classNames: "category-row",
-  displayCategoryDescription: true,
+
+  @computed("options.displayCategoryDescription")
+  displayCategoryDescription(displayCategoryDescription) {
+    if (Ember.isNone(displayCategoryDescription)) {
+      return true;
+    }
+
+    return displayCategoryDescription;
+  },
 
   @computed("computedContent.value", "computedContent.name")
   category(value, name) {
@@ -51,8 +59,8 @@ export default SelectKitRowComponent.extend({
 
   topicCount: Ember.computed.alias("category.topic_count"),
 
-  @computed("options.displayCategoryDescription", "category.description")
-  hasDescription(displayCategoryDescription, description) {
+  @computed("displayCategoryDescription", "category.description")
+  shouldDisplayDescription(displayCategoryDescription, description) {
     return displayCategoryDescription && description && description !== "null";
   },
 
diff --git a/app/assets/javascripts/select-kit/components/category-selector.js.es6 b/app/assets/javascripts/select-kit/components/category-selector.js.es6
index 9305517bf99..63e58e3d308 100644
--- a/app/assets/javascripts/select-kit/components/category-selector.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-selector.js.es6
@@ -11,13 +11,13 @@ export default MultiSelectComponent.extend({
   init() {
     this._super();
 
-    this.set("headerComponentOptions", Ember.Object.create({
+    this.get("headerComponentOptions").setProperties({
       selectedNameComponent: "multi-select/selected-category"
-    }));
+    });
 
-    this.set("rowComponentOptions", Ember.Object.create({
+    this.get("rowComponentOptions").setProperties({
       displayCategoryDescription: false
-    }));
+    });
   },
 
   computeValues() {
diff --git a/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6 b/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6
index badd3ceb843..7ed95af14a0 100644
--- a/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6
@@ -9,6 +9,14 @@ export default CategoryChooserComponent.extend({
   allowUncategorized: true,
   clearable: true,
 
+  init() {
+    this._super();
+
+    this.get("rowComponentOptions").setProperties({
+      displayCategoryDescription: false
+    });
+  },
+
   mutateValue(value) {
     if (value) {
       this.set("value", Category.findById(value));
diff --git a/app/assets/javascripts/select-kit/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
index 2ba26d02130..4e4f0ded9b2 100644
--- a/app/assets/javascripts/select-kit/templates/components/category-row.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
@@ -11,7 +11,7 @@
       </div>
     {{/if}}
 
-    {{#if hasDescription}}
+    {{#if shouldDisplayDescription}}
       <div class="category-desc">{{description}}</div>
     {{/if}}
 {{else}}