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

When creating/editing a category the parent shoudl be none.

This commit is contained in:
Robin Ward 2014-02-10 14:08:16 -05:00
parent 45afed8720
commit f1a9e52d7e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars
View File

@ -29,7 +29,7 @@
{{/each}} {{/each}}
{{else}} {{else}}
<label>{{i18n category.parent}}</label> <label>{{i18n category.parent}}</label>
{{categoryChooser valueAttribute="id" value=parent_category_id categories=parentCategories}} {{categoryChooser valueAttribute="id" value=parent_category_id categories=parentCategories rootNone=true}}
{{/if}} {{/if}}
</section> </section>

6
app/assets/javascripts/discourse/views/category_chooser_view.js
View File

@ -26,7 +26,11 @@ Discourse.CategoryChooserView = Discourse.ComboboxView.extend({
none: function() { none: function() {
if (Discourse.User.currentProp('staff') || Discourse.SiteSettings.allow_uncategorized_topics) { if (Discourse.User.currentProp('staff') || Discourse.SiteSettings.allow_uncategorized_topics) {
return Discourse.Category.list().findBy('id', Discourse.Site.currentProp('uncategorized_category_id')); if (this.get('rootNone')) {
return "category.none";
} else {
return Discourse.Category.list().findBy('id', Discourse.Site.currentProp('uncategorized_category_id'));
}
} else { } else {
return 'category.choose'; return 'category.choose';
} }