github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bug with filter columns

Browse source 
Closes #162
This commit is contained in:
Simon Willison 2017-12-06 21:05:53 -08:00
commit 52a5e95d21
No known key found for this signature in database
GPG key ID: 17E2DEA2588B7F52
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
datasette/app.py
View file

@ -621,9 +621,13 @@ class TableView(RowTableShared):
rows = list(rows) rows = list(rows)
display_columns = columns display_columns = columns
filter_columns = columns
if not use_rowid and not is_view: if not use_rowid and not is_view:
display_columns = ['Link'] + display_columns display_columns = ['Link'] + display_columns
if use_rowid and filter_columns[0] == 'rowid':
filter_columns = filter_columns[1:]
info = self.ds.inspect() info = self.ds.inspect()
table_rows = None table_rows = None
if not is_view: if not is_view:
@ -670,6 +674,7 @@ class TableView(RowTableShared):
'use_rowid': use_rowid, 'use_rowid': use_rowid,
'filters': filters, 'filters': filters,
'display_columns': display_columns, 'display_columns': display_columns,
'filter_columns': filter_columns,
'display_rows': await self.make_display_rows(name, hash, table, rows, display_columns, pks, is_view, use_rowid), 'display_rows': await self.make_display_rows(name, hash, table, rows, display_columns, pks, is_view, use_rowid),
} }

12
datasette/templates/table.html
View file

@ -35,10 +35,8 @@
<div class="select-wrapper"> <div class="select-wrapper">
<select name="_filter_column_{{ loop.index }}"> <select name="_filter_column_{{ loop.index }}">
<option value="">- remove filter -</option> <option value="">- remove filter -</option>
{% for c in display_columns %} {% for c in filter_columns %}
{% if c != 'rowid' %} <option{% if c == column %} selected{% endif %}>{{ c }}</option>
<option{% if c == column %} selected{% endif %}>{{ c }}</option>
{% endif %}
{% endfor %} {% endfor %}
</select> </select>
</div><div class="select-wrapper filter-op"> </div><div class="select-wrapper filter-op">
@ -54,10 +52,8 @@
<div class="select-wrapper"> <div class="select-wrapper">
<select name="_filter_column"> <select name="_filter_column">
<option value="">- column -</option> <option value="">- column -</option>
{% for column in display_columns %} {% for column in filter_columns %}
{% if column != 'rowid' %} <option>{{ column }}</option>
<option>{{ column }}</option>
{% endif %}
{% endfor %} {% endfor %}
</select> </select>
</div><div class="select-wrapper filter-op"> </div><div class="select-wrapper filter-op">