rc/aircox
13
1
Fork 1
Code Issues 15 Pull Requests Projects Releases Wiki Activity

add url & make it work

Browse Source
This commit is contained in:
bkfox
2022-05-05 17:15:06 +02:00
parent e44b77d0b3
commit ff398d8e7f
2 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
aircox/admin/filters.py
View File

@ -1,6 +1,7 @@
from django.db import models
from django.contrib.admin import filters
from django.utils.translation import gettext_lazy as _
from django.utils.http import urlencode
__all__ = ('DateFieldFilter', 'DateTimeField')
@ -15,25 +16,41 @@ class DateFieldFilter(filters.FieldListFilter):
self.field_generic = '%s__' % field_path
self.date_params = {k: v for k, v in params.items()
if k.startswith(self.field_generic)}
self.links = ((_('Exact'), self.field_generic + 'exact'),
(_('Since'), self.field_generic + 'gte'),
(_('Until'), self.field_generic + 'lte'))
# links as: (label, param, input_type|None, value)
self.links = [(_('Exact'), self.field_generic + 'exact', self.input_type),
(_('Since'), self.field_generic + 'gte', self.input_type),
(_('Until'), self.field_generic + 'lte', self.input_type)]
if field.null:
self.links.insert(0, (_('None'), self.field_generic + 'isnull', None, '1'))
self.query_attrs = {k:v for k,v in request.GET.items()
if k not in self.date_params}
self.query_string = urlencode(self.query_attrs)
super().__init__(field, request, params, model, model_admin, field_path)
def expected_parameters(self):
return [link[1] for link in self.links]
def choices(self, changelist):
yield {'label': _('Any'),
'type': None,
'query_string': self.query_string}
for link in self.links:
yield {'label': link[0],
'name': link[1],
'value': self.date_params.get(link[1]),
'type': self.input_type,}
value = len(link) > 3 and link[3] or self.date_params.get(link[1])
yield {
'label': link[0], 'name': link[1], 'value': value,
'type': link[2],
'query_attrs': self.query_attrs,
'query_string': urlencode({link[1]: value}) + '&' + self.query_string
if value else self.query_string,
}
class DateTimeFieldFilter(DateFieldFilter):
""" Display datetime input """
input_type = 'datetime'
input_type = 'datetime-local'
filters.FieldListFilter.register(

14
aircox/templates/admin/aircox/filters/date_filter.html
View File

@ -5,14 +5,22 @@
{% block content %}
<ul>
{% for choice in choices %}
<div>
<form method="GET">
<li>
{% if choice.type %}
<form method="GET" action="?{{ choice.query_string }}"
onsubmit="return this.{{ choice.name }}.value ? true : false"">
<label for="filter-{{ choice.name }}">{{ choice.label }}: </label>
<input id="filter-{{ choice.name }}" type="{{ choice.type }}" name="{{ choice.name }}"
value="{{ choice.value }}" {{ choice.extra }} />
{% for k, v in choice.query_attrs.items %}
<input type="hidden" name="{{k}}" value="{{v}}" />
{% endfor %}
<button class="button"><img src="{% static "admin/img/search.svg" %}" /></button>
</form>
</div>
{% else %}
<a href="?{{ choice.query_string }}">{{ choice.label }}</a>
{% endif %}
</li>
{% endfor %}
</ul>
{% endblock %}