IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: duplicated categories in select-box

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2017-08-24 16:54:10 +02:00 committed by GitHub
parent a4e3e081c9
commit 21d6c7f6b3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/discourse/components/category-select-box.js.es6
View File

@ -74,7 +74,6 @@ export default SelectBoxComponent.extend({
rowContentTemplate(item) { rowContentTemplate(item) {
let category; let category;
let result = '<div class="category-status">';
// If we have no id, but text with the uncategorized name, we can use that badge. // If we have no id, but text with the uncategorized name, we can use that badge.
if (Ember.isEmpty(item.id)) { if (Ember.isEmpty(item.id)) {
@ -87,18 +86,20 @@ export default SelectBoxComponent.extend({
} }
if (!category) return item.text; if (!category) return item.text;
result += categoryBadgeHTML(category, {link: false, allowUncategorized: true, hideParent: true}); let result = categoryBadgeHTML(category, {link: false, allowUncategorized: true, hideParent: true});
const parentCategoryId = category.get("parent_category_id"); const parentCategoryId = category.get("parent_category_id");
if (parentCategoryId) { if (parentCategoryId) {
result += categoryBadgeHTML(Category.findById(parentCategoryId), {link: false}) + "&nbsp;" + result; result = `<div class="category-status">${categoryBadgeHTML(Category.findById(parentCategoryId), {link: false})}&nbsp;${result}`;
} else {
result = `<div class="category-status">${result}`;
} }
result += ` <span class='topic-count'>&times; ${category.get("topic_count")}</span></div>`; result += ` <span class="topic-count">&times; ${category.get("topic_count")}</span></div>`;
const description = category.get("description"); const description = category.get("description");
// TODO wtf how can this be null?; // TODO wtf how can this be null?;
if (description && description !== 'null') { if (description && description !== "null") {
result += `<div class="category-desc">${description.substr(0, 200)}${description.length > 200 ? '&hellip;' : ''}</div>`; result += `<div class="category-desc">${description.substr(0, 200)}${description.length > 200 ? '&hellip;' : ''}</div>`;
} }