mirror
/
datasette
kopia lustrzana https://github.com/simonw/datasette
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Added '- pick a column -' as first option

sanic-07
Simon Willison 2017-11-22 20:39:53 -08:00
rodzic 0071b5d6f5
commit 82c20ea36e
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: FBB38AFE227189DB
2 zmienionych plików z 12 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
datasette/templates/table.html
Wyświetl plik

@ -49,6 +49,7 @@
{% endfor %} {% endfor %}
<p> <p>
<select name="_filter_column" style="font-size: 20px"> <select name="_filter_column" style="font-size: 20px">
<option value="">- pick a column -</option>
{% for column in display_columns %} {% for column in display_columns %}
{% if column != 'rowid' %} {% if column != 'rowid' %}
<option>{{ column }}</option> <option>{{ column }}</option>

22
datasette/utils.py
Wyświetl plik

@ -402,20 +402,20 @@ filter_column_re = re.compile(r'^_filter_column_\d+$')
def filters_should_redirect(special_args): def filters_should_redirect(special_args):
print('special_args: ', special_args)
redirect_params = [] redirect_params = []
if '_filter_column' in special_args: if '_filter_column' in special_args:
filter_column = special_args['_filter_column'] filter_column = special_args['_filter_column']
filter_op = special_args.get('_filter_op') or '' if filter_column:
filter_value = special_args.get('_filter_value') or '' filter_op = special_args.get('_filter_op') or ''
if '__' in filter_op: filter_value = special_args.get('_filter_value') or ''
filter_op, filter_value = filter_op.split('__', 1) if '__' in filter_op:
redirect_params.extend([ filter_op, filter_value = filter_op.split('__', 1)
('{}__{}'.format(filter_column, filter_op), filter_value), redirect_params.extend([
('_filter_column', None), ('{}__{}'.format(filter_column, filter_op), filter_value),
('_filter_op', None), ('_filter_column', None),
('_filter_value', None), ('_filter_op', None),
]) ('_filter_value', None),
])
# Now handle _filter_column_1=name&_filter_op_1=contains&_filter_value_1=hello # 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)] column_keys = [k for k in special_args if filter_column_re.match(k)]
for column_key in column_keys: for column_key in column_keys: