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

FIX: in create/edit category modal, don't prompt to choose a parent category when allow_uncategorized_topics is false

This commit is contained in:
Neil Lalonde 2016-10-05 12:06:37 -04:00
parent 843c7a21c9
commit a061c025f1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/category-chooser.js.es6
View File

@ -38,7 +38,7 @@ export default ComboboxView.extend({
@computed("rootNone") @computed("rootNone")
none(rootNone) { none(rootNone) {
if (Discourse.SiteSettings.allow_uncategorized_topics) { if (Discourse.SiteSettings.allow_uncategorized_topics || this.get('allowUncategorized')) {
if (rootNone) { if (rootNone) {
return "category.none"; return "category.none";
} else { } else {

2
app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
View File

@ -19,7 +19,7 @@
{{/each}} {{/each}}
{{else}} {{else}}
<label>{{i18n 'category.parent'}}</label> <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}} {{/if}}
</section> </section>
{{/if}} {{/if}}