From a061c025f1d0b3bbb86188c6ccb277268de06ff1 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 5 Oct 2016 12:06:37 -0400
Subject: [PATCH] FIX: in create/edit category modal, don't prompt to choose a
 parent category when allow_uncategorized_topics is false

---
 .../javascripts/discourse/components/category-chooser.js.es6    | 2 +-
 .../discourse/templates/components/edit-category-general.hbs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/category-chooser.js.es6 b/app/assets/javascripts/discourse/components/category-chooser.js.es6
index 42fe4412ed..ab0c704b59 100644
--- a/app/assets/javascripts/discourse/components/category-chooser.js.es6
+++ b/app/assets/javascripts/discourse/components/category-chooser.js.es6
@@ -38,7 +38,7 @@ export default ComboboxView.extend({
 
   @computed("rootNone")
   none(rootNone) {
-    if (Discourse.SiteSettings.allow_uncategorized_topics) {
+    if (Discourse.SiteSettings.allow_uncategorized_topics || this.get('allowUncategorized')) {
       if (rootNone) {
         return "category.none";
       } else {
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index 9f93466ae1..734ad2b4c7 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -19,7 +19,7 @@
         {{/each}}
       {{else}}
         <label>{{i18n 'category.parent'}}</label>
-        {{category-chooser valueAttribute="id" value=category.parent_category_id categories=parentCategories rootNone=true}}
+        {{category-chooser valueAttribute="id" value=category.parent_category_id categories=parentCategories rootNone=true allowUncategorized="true"}}
       {{/if}}
     </section>
   {{/if}}