瀏覽代碼

[fix] do not hide categorie inside preferences if there is no engine activated

Thomas Pointhuber 10 年之前
父節點
當前提交
0978f10887

+ 1
- 1
searx/templates/courgette/preferences.html 查看文件

@@ -101,7 +101,7 @@
101 101
                 <th>{{ _('Category') }}</th>
102 102
                 <th>{{ _('Allow') }} / {{ _('Block') }}</th>
103 103
             </tr>
104
-        {% for categ in categories %}
104
+        {% for categ in all_categories %}
105 105
             {% for search_engine in engines_by_category[categ] %}
106 106
 
107 107
                 {% if not search_engine.private %}

+ 1
- 1
searx/templates/default/preferences.html 查看文件

@@ -89,7 +89,7 @@
89 89
             <th>{{ _('Category') }}</th>
90 90
             <th>{{ _('Allow') }} / {{ _('Block') }}</th>
91 91
         </tr>
92
-    {% for categ in categories %}
92
+    {% for categ in all_categories %}
93 93
         {% for search_engine in engines_by_category[categ] %}
94 94
 
95 95
             {% if not search_engine.private %}

+ 2
- 2
searx/templates/oscar/preferences.html 查看文件

@@ -117,7 +117,7 @@
117 117
 
118 118
                 <!-- Nav tabs -->
119 119
                 <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 %}
121 121
                     <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
122 122
                     {% endfor %}
123 123
                 </ul>
@@ -128,7 +128,7 @@
128 128
 
129 129
                 <!-- Tab panes -->
130 130
                 <div class="tab-content">
131
-                    {% for categ in categories %}
131
+                    {% for categ in all_categories %}
132 132
                     <noscript><label>{{ _(categ) }}</label>
133 133
                     </noscript>
134 134
                     <div class="tab-pane{% if loop.first %} active{% endif %} active_if_nojs" id="tab_engine_{{ categ|replace(' ', '_') }}">

+ 8
- 0
searx/webapp.py 查看文件

@@ -279,6 +279,12 @@ def render(template_name, override_theme=None, **kwargs):
279 279
                                     if x != 'general'
280 280
                                     and x in nonblocked_categories)
281 281
 
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
+
282 288
     if 'selected_categories' not in kwargs:
283 289
         kwargs['selected_categories'] = []
284 290
         for arg in request.args:
@@ -286,11 +292,13 @@ def render(template_name, override_theme=None, **kwargs):
286 292
                 c = arg.split('_', 1)[1]
287 293
                 if c in categories:
288 294
                     kwargs['selected_categories'].append(c)
295
+
289 296
     if not kwargs['selected_categories']:
290 297
         cookie_categories = request.cookies.get('categories', '').split(',')
291 298
         for ccateg in cookie_categories:
292 299
             if ccateg in categories:
293 300
                 kwargs['selected_categories'].append(ccateg)
301
+
294 302
     if not kwargs['selected_categories']:
295 303
         kwargs['selected_categories'] = ['general']
296 304