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

FIX: Show uncategorized with badge/description in the category chooser

This commit is contained in:
Robin Ward 2014-08-28 12:42:31 -04:00
parent c9262a8390
commit 30b102aa98
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/models/category.js
View File

@ -188,6 +188,8 @@ Discourse.Category = Discourse.Model.extend({
}.property('id')
});
var _uncategorized;
Discourse.Category.reopenClass({
NotificationLevel: {
@ -197,6 +199,11 @@ Discourse.Category.reopenClass({
MUTED: 0
},
findUncategorized: function() {
_uncategorized = _uncategorized || Discourse.Category.list().findBy('id', Discourse.Site.currentProp('uncategorized_category_id'));
return _uncategorized;
},
slugFor: function(category) {
if (!category) return "";

18
app/assets/javascripts/discourse/views/category-chooser.js.es6
View File

@ -34,7 +34,7 @@ export default ComboboxView.extend({
if (this.get('rootNone')) {
return "category.none";
} else {
return Discourse.Category.list().findBy('id', Discourse.Site.currentProp('uncategorized_category_id'));
return Discourse.Category.findUncategorized();
}
} else {
return 'category.choose';
@ -42,9 +42,20 @@ export default ComboboxView.extend({
}.property(),
template: function(item) {
var category = Discourse.Category.findById(parseInt(item.id,10));
if (!category) return item.text;
var category;
// If we have no id, but text with the uncategorized name, we can use that badge.
if (Em.empty(item.id)) {
var uncat = Discourse.Category.findUncategorized();
if (uncat && uncat.get('name') === item.text) {
category = uncat;
}
} else {
category = Discourse.Category.findById(parseInt(item.id,10));
}
if (!category) return item.text;
var result = badgeHtml(category, {showParent: false, link: false, allowUncategorized: true}),
parentCategoryId = category.get('parent_category_id');
if (parentCategoryId) {
@ -56,7 +67,6 @@ export default ComboboxView.extend({
var description = category.get('description');
// TODO wtf how can this be null?;
if (description && description !== 'null') {
result += '<div class="category-desc">' +
description.substr(0,200) +
(description.length > 200 ? '&hellip;' : '') +