FIX: Missing count method for search results
This commit is contained in:
parent
adc07ae8ad
commit
e7359a118b
|
@ -98,15 +98,19 @@ module KnowledgeExplorer
|
|||
def knowledge_explorer_categories
|
||||
selected_categories = SiteSetting.knowledge_explorer_categories.split("|")
|
||||
|
||||
categories = Category.where('id IN (?)', selected_categories)
|
||||
if selected_categories
|
||||
categories = Category.where('id IN (?)', selected_categories)
|
||||
|
||||
categories.select { |c| @guardian.can_see_category?(c) }
|
||||
return categories.select { |c| @guardian.can_see_category?(c) }
|
||||
end
|
||||
end
|
||||
|
||||
def knowledge_explorer_tags
|
||||
selected_tags = SiteSetting.knowledge_explorer_tags.split("|")
|
||||
|
||||
Tag.where('name IN (?)', selected_tags)
|
||||
if selected_tags
|
||||
return Tag.where('name IN (?)', selected_tags)
|
||||
end
|
||||
end
|
||||
|
||||
def category_by_filter(category_filter)
|
||||
|
|
|
@ -36,6 +36,11 @@ export default Ember.Controller.extend({
|
|||
return results.length === 0;
|
||||
},
|
||||
|
||||
@computed("searchResults")
|
||||
searchCount(results) {
|
||||
return results.length;
|
||||
},
|
||||
|
||||
@observes("filterTags")
|
||||
filterByTags() {
|
||||
const filterTags = this.get("filterTags");
|
||||
|
@ -49,7 +54,6 @@ export default Ember.Controller.extend({
|
|||
arrayContainsArray(topic.tags, filter)
|
||||
);
|
||||
|
||||
debugger;
|
||||
const filteredTags = [];
|
||||
|
||||
// add active tags
|
||||
|
|
|
@ -22,9 +22,9 @@
|
|||
{{/if}}
|
||||
{{else if hasSearchResults}}
|
||||
{{#if emptySearchResults}}
|
||||
{<div class="no-result">{i18n 'search.no_results'}}</div>
|
||||
<div class="no-result">{{i18n 'search.no_results'}}</div>
|
||||
{{else}}
|
||||
<div>{{i18n "knowledge_explorer.search.results" count=count}}</div>
|
||||
<div>{{i18n 'knowledge_explorer.search.results' count=searchCount}}</div>
|
||||
{{knowledge-explorer-topic-list topics=searchResults}}
|
||||
{{/if}}
|
||||
{{else}}
|
||||
|
|
Loading…
Reference in New Issue