Refactor grid filters to use colander/deform

This commit is contained in:
Lance Edgar 2018-02-12 12:15:07 -06:00
parent f636b98cb3
commit d9ff59afda
4 changed files with 57 additions and 54 deletions

View file

@ -1,15 +1,15 @@
## -*- coding: utf-8 -*-
## -*- coding: utf-8; -*-
<div class="newfilters">
${form.begin(method='get')}
<input type="hidden" name="reset-to-default-filters" value="false" />
<input type="hidden" name="save-current-filters-as-defaults" value="false" />
${h.form(form.action_url, method='get')}
${h.hidden('reset-to-default-filters', value='false')}
${h.hidden('save-current-filters-as-defaults', value='false')}
<fieldset>
<legend>Filters</legend>
% for filtr in form.iter_filters():
<div class="filter" id="filter-${filtr.key}" data-key="${filtr.key}"${' style="display: none;"' if not filtr.active else ''|n}>
${form.checkbox('{0}-active'.format(filtr.key), class_='active', id='filter-active-{0}'.format(filtr.key), checked=filtr.active)}
${h.checkbox('{}-active'.format(filtr.key), class_='active', id='filter-active-{}'.format(filtr.key), checked=filtr.active)}
<label for="filter-active-${filtr.key}">${filtr.label}</label>
<div class="inputs">
${form.filter_verb(filtr)}
@ -20,19 +20,19 @@
</fieldset>
<div class="buttons">
${form.tag('button', type='submit', id='apply-filters', c="Apply Filters")}
<button type="submit" id="apply-filters">Apply Filters</button>
<select id="add-filter">
<option value="">Add a Filter</option>
% for filtr in form.iter_filters():
<option value="${filtr.key}"${' disabled="disabled"' if filtr.active else ''|n}>${filtr.label}</option>
% endfor
</select>
${form.tag('button', type='button', id='default-filters', c="Default View")}
${form.tag('button', type='button', id='clear-filters', c="No Filters")}
<button type="button" id="default-filters">Default View</button>
<button type="button" id="clear-filters">No Filters</button>
% if allow_save_defaults and request.user:
${form.tag('button', type='button', id='save-defaults', c="Save Defaults")}
<button type="button" id="save-defaults">Save Defaults</button>
% endif
</div>
${form.end()}
${h.end_form()}
</div><!-- newfilters -->