zaclys/searxng
1
0
Fork 1
mirror of https://github.com/searxng/searxng synced 2024-01-01 19:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

[fix] don't show category if there is not active engine in

Browse source 
When deactivate all the engines of a category, this category disappeared.  This
feature has been lost in commit 8e9ad1cc.

Closes: https://github.com/searxng/searxng/issues/1020
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
Markus Heiser 2022-07-23 18:26:43 +02:00
parent 3ff576ea72
commit 2a9d6a5b4a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
searx/templates/simple/categories.html
View file

@ -13,7 +13,7 @@
} -%} } -%}
<div id="categories" class="search_categories">{{- '' -}} <div id="categories" class="search_categories">{{- '' -}}
<div id="categories_container"> <div id="categories_container">
{%- for category in categories_as_tabs -%} {%- for category in categories -%}
<div class="category"><input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}"{% if category in selected_categories %} checked="checked"{% endif %}/> <div class="category"><input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}"{% if category in selected_categories %} checked="checked"{% endif %}/>
<label for="checkbox_{{ category|replace(' ', '_') }}" class="tooltips"> <label for="checkbox_{{ category|replace(' ', '_') }}" class="tooltips">
{{- icon_big(category_icons[category]) if category in category_icons else icon_big('globe-outline') -}} {{- icon_big(category_icons[category]) if category in category_icons else icon_big('globe-outline') -}}

6
searx/webapp.py
View file

@ -368,7 +368,7 @@ def get_translations():
} }
def _get_enable_categories(all_categories: Iterable[str]): def _get_enable_categories(ui_categories: Iterable[str]):
disabled_engines = request.preferences.engines.get_disabled() disabled_engines = request.preferences.engines.get_disabled()
enabled_categories = set( enabled_categories = set(
# pylint: disable=consider-using-dict-items # pylint: disable=consider-using-dict-items
@ -377,7 +377,7 @@ def _get_enable_categories(all_categories: Iterable[str]):
for category in engines[engine_name].categories for category in engines[engine_name].categories
if (engine_name, category) not in disabled_engines if (engine_name, category) not in disabled_engines
) )
return [x for x in all_categories if x in enabled_categories] return [x for x in ui_categories if x in enabled_categories]
def get_pretty_url(parsed_url: urllib.parse.ParseResult): def get_pretty_url(parsed_url: urllib.parse.ParseResult):
@ -429,7 +429,7 @@ def render(template_name: str, **kwargs):
kwargs['theme'] = request.preferences.get_value('theme') kwargs['theme'] = request.preferences.get_value('theme')
kwargs['method'] = request.preferences.get_value('method') kwargs['method'] = request.preferences.get_value('method')
kwargs['categories_as_tabs'] = list(settings['categories_as_tabs'].keys()) kwargs['categories_as_tabs'] = list(settings['categories_as_tabs'].keys())
kwargs['categories'] = _get_enable_categories(categories.keys()) kwargs['categories'] = _get_enable_categories(settings['categories_as_tabs'].keys())
kwargs['OTHER_CATEGORY'] = OTHER_CATEGORY kwargs['OTHER_CATEGORY'] = OTHER_CATEGORY
# i18n # i18n