context columns cannot be filtered for search input

rutube · Apr 12, 2016 · 4f06401 · 4f06401
1 parent efcee87
commit 4f06401
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/alco/grep/templates/grep/log_view.html b/alco/grep/templates/grep/log_view.html
@@ -31,7 +31,7 @@
                             </span>
                         </div>
                         <div class="btn-group" id="filter-toggles">
-                        {% for c in columns %}
+                        {% for c in filtered_columns %}
                             {% if not c.filtered %}
                                 <button class="btn btn-xs btn-default filter-toggler" value="{{ c.name }}">{{ c.name }}</button>
                             {% endif %}

diff --git a/alco/grep/views.py b/alco/grep/views.py
@@ -61,6 +61,7 @@ def get_context_data(self, **kwargs):
         cd['filters'] = filters
         cd['columns'] = columns
         cd['context_columns'] = context_columns
+        cd['filtered_columns'] = list(set(columns) | set(context_columns))
         cd['column_names'] = [c.name for c in columns]
         return cd