git.iko.soy/searx
on master help sign in
[fix] do not hide categorie inside preferences if there is no engine activated
commit0978f108879324a0367bc6d362f896532d6fc04f authorThomas Pointhuber <thomas.pointhuber@gmx.at> dateFri 5 Jun 2015, 08:48 (11 years ago) parentaa1b8fa
4 files changed+12−4
compare with master
unifiedsplit
searx/templates/courgette/preferences.html+1−1 searx/templates/default/preferences.html+1−1 searx/templates/oscar/preferences.html+2−2 searx/webapp.py+8
searx/templates/courgette/preferences.html+1−1
@@ -101,7 +101,7 @@
101101 <th>{{ _('Category') }}</th>
102102 <th>{{ _('Allow') }} / {{ _('Block') }}</th>
103103 </tr>
104− {% for categ in categories %}
104+ {% for categ in all_categories %}
105105 {% for search_engine in engines_by_category[categ] %}
106106
107107 {% if not search_engine.private %}
searx/templates/default/preferences.html+1−1
@@ -89,7 +89,7 @@
8989 <th>{{ _('Category') }}</th>
9090 <th>{{ _('Allow') }} / {{ _('Block') }}</th>
9191 </tr>
92− {% for categ in categories %}
92+ {% for categ in all_categories %}
9393 {% for search_engine in engines_by_category[categ] %}
9494
9595 {% if not search_engine.private %}
searx/templates/oscar/preferences.html+2−2
@@ -117,7 +117,7 @@
117117
118118 <!-- Nav tabs -->
119119 <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;">
120− {% for categ in categories %}
120+ {% for categ in all_categories %}
121121 <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
122122 {% endfor %}
123123 </ul>
@@ -128,7 +128,7 @@
128128
129129 <!-- Tab panes -->
130130 <div class="tab-content">
131− {% for categ in categories %}
131+ {% for categ in all_categories %}
132132 <noscript><label>{{ _(categ) }}</label>
133133 </noscript>
134134 <div class="tab-pane{% if loop.first %} active{% endif %} active_if_nojs" id="tab_engine_{{ categ|replace(' ', '_') }}">
searx/webapp.py+8
@@ -279,6 +279,12 @@ def render(template_name, override_theme=None, **kwargs):
279279 if x != 'general'
280280 and x in nonblocked_categories)
281281
282+ if 'all_categories' not in kwargs:
283+ kwargs['all_categories'] = ['general']
284+ kwargs['all_categories'].extend(x for x in
285+ sorted(categories.keys())
286+ if x != 'general')
287+
282288 if 'selected_categories' not in kwargs:
283289 kwargs['selected_categories'] = []
284290 for arg in request.args:
@@ -286,11 +292,13 @@ def render(template_name, override_theme=None, **kwargs):
286292 c = arg.split('_', 1)[1]
287293 if c in categories:
288294 kwargs['selected_categories'].append(c)
295+
289296 if not kwargs['selected_categories']:
290297 cookie_categories = request.cookies.get('categories', '').split(',')
291298 for ccateg in cookie_categories:
292299 if ccateg in categories:
293300 kwargs['selected_categories'].append(ccateg)
301+
294302 if not kwargs['selected_categories']:
295303 kwargs['selected_categories'] = ['general']
296304