diff --git a/app/controllers/knowledge_explorer/knowledge_explorer_controller.rb b/app/controllers/knowledge_explorer/knowledge_explorer_controller.rb index a615cb8..13b4efc 100644 --- a/app/controllers/knowledge_explorer/knowledge_explorer_controller.rb +++ b/app/controllers/knowledge_explorer/knowledge_explorer_controller.rb @@ -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) diff --git a/assets/javascripts/discourse/controllers/knowledge-explorer.js.es6 b/assets/javascripts/discourse/controllers/knowledge-explorer.js.es6 index 9caec65..77be35c 100644 --- a/assets/javascripts/discourse/controllers/knowledge-explorer.js.es6 +++ b/assets/javascripts/discourse/controllers/knowledge-explorer.js.es6 @@ -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 diff --git a/assets/javascripts/discourse/templates/knowledge-explorer.hbs b/assets/javascripts/discourse/templates/knowledge-explorer.hbs index a4831c8..aa0a466 100644 --- a/assets/javascripts/discourse/templates/knowledge-explorer.hbs +++ b/assets/javascripts/discourse/templates/knowledge-explorer.hbs @@ -22,9 +22,9 @@ {{/if}} {{else if hasSearchResults}} {{#if emptySearchResults}} - {
{i18n 'search.no_results'}}
+
{{i18n 'search.no_results'}}
{{else}} -
{{i18n "knowledge_explorer.search.results" count=count}}
+
{{i18n 'knowledge_explorer.search.results' count=searchCount}}
{{knowledge-explorer-topic-list topics=searchResults}} {{/if}} {{else}}