Include date hierarchy in quick removal links (#218)
* Include date hierarchy in quick removal links * use date field name in removal link * reduce diff * tweak some details * start adding tests * use mock without spec :( it's not easy to instantiate ChangeList, and speccing from the class means that many attributes are not recognized * more tests * more tests * more checks for generated URLs * better tags and tests * compat for tox 4
This commit is contained in:
@@ -6,9 +6,11 @@
|
||||
{% if cl.has_filters %}
|
||||
<div id="changelist-filter">
|
||||
<h2>{% translate 'Filter' %}</h2>
|
||||
{% if cl.has_active_filters %}
|
||||
{% get_admin_interface_active_date_hierarchy cl as active_date_hierarchy %}
|
||||
{% get_admin_interface_setting "list_filter_removal_links" as list_filter_removal_links %}
|
||||
{% if list_filter_removal_links %}
|
||||
{% if cl.has_active_filters %}
|
||||
{% if list_filter_removal_links %}
|
||||
{% if active_date_hierarchy %}{% admin_interface_date_hierarchy_removal_link cl active_date_hierarchy %}{% endif %}
|
||||
{% for spec in cl.filter_specs %}{% admin_interface_filter_removal_link cl spec %}{% endfor %}
|
||||
<h3 id="changelist-filter-clear">
|
||||
<a href="{{ cl.clear_all_filters_qs }}">{% translate "Clear all filters" %} ✖</a>
|
||||
@@ -18,7 +20,12 @@
|
||||
{# Translators: don't translate this, the django catalog already contains it #}
|
||||
<a href="{{ cl.clear_all_filters_qs }}">✖ {% translate "Clear all filters" %}</a>
|
||||
</h3>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% elif active_date_hierarchy and list_filter_removal_links %}
|
||||
{% admin_interface_date_hierarchy_removal_link cl active_date_hierarchy %}
|
||||
<h3 id="changelist-filter-clear">
|
||||
<a href="{{ cl.clear_all_filters_qs }}">{% translate "Clear all filters" %} ✖</a>
|
||||
</h3>
|
||||
{% endif %}
|
||||
{% for spec in cl.filter_specs %}{% admin_list_filter cl spec %}{% endfor %}
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user