Added '- pick a column -' as first option

simonw · Nov 23, 2017 · 82c20ea · 82c20ea
1 parent 0071b5d
commit 82c20ea
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/datasette/templates/table.html b/datasette/templates/table.html
@@ -49,6 +49,7 @@ <h2>{{ "{:,}".format(table_rows) }} total row{% if table_rows == 1 %}{% else %}s
     {% endfor %}
     <p>
         <select name="_filter_column" style="font-size: 20px">
+            <option value="">- pick a column -</option>
             {% for column in display_columns %}
                 {% if column != 'rowid' %}
                     <option>{{ column }}</option>

diff --git a/datasette/utils.py b/datasette/utils.py
@@ -402,20 +402,20 @@ def build_where_clauses(self):
 
 
 def filters_should_redirect(special_args):
-    print('special_args: ', special_args)
     redirect_params = []
     if '_filter_column' in special_args:
         filter_column = special_args['_filter_column']
-        filter_op = special_args.get('_filter_op') or ''
-        filter_value = special_args.get('_filter_value') or ''
-        if '__' in filter_op:
-            filter_op, filter_value = filter_op.split('__', 1)
-        redirect_params.extend([
-            ('{}__{}'.format(filter_column, filter_op), filter_value),
-            ('_filter_column', None),
-            ('_filter_op', None),
-            ('_filter_value', None),
-        ])
+        if filter_column:
+            filter_op = special_args.get('_filter_op') or ''
+            filter_value = special_args.get('_filter_value') or ''
+            if '__' in filter_op:
+                filter_op, filter_value = filter_op.split('__', 1)
+            redirect_params.extend([
+                ('{}__{}'.format(filter_column, filter_op), filter_value),
+                ('_filter_column', None),
+                ('_filter_op', None),
+                ('_filter_value', None),
+            ])
     # Now handle _filter_column_1=name&_filter_op_1=contains&_filter_value_1=hello
     column_keys = [k for k in special_args if filter_column_re.match(k)]
     for column_key in column_keys: