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

fix date lookup filters

Browse Source
This commit is contained in:
bkfox
2022-08-07 10:48:31 +02:00
parent 9c147b2a6d
commit 520f5ad0d8
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
aircox/admin/episode.py
View File

@ -59,7 +59,8 @@ class EpisodeAdminForm(ModelForm):
class EpisodeAdmin(PageAdmin): class EpisodeAdmin(PageAdmin):
form = EpisodeAdminForm form = EpisodeAdminForm
list_display = PageAdmin.list_display list_display = PageAdmin.list_display
list_filter = PageAdmin.list_filter + ('diffusion__start',) list_filter = tuple(f for f in PageAdmin.list_filter if f != 'pub_date') + \
('diffusion__start', 'pub_date')
search_fields = PageAdmin.search_fields + ('parent__title',) search_fields = PageAdmin.search_fields + ('parent__title',)
# readonly_fields = ('parent',) # readonly_fields = ('parent',)

4
aircox/admin/filters.py
View File

@ -17,8 +17,10 @@ class DateFieldFilter(filters.FieldListFilter):
self.date_params = {k: v for k, v in params.items() self.date_params = {k: v for k, v in params.items()
if k.startswith(self.field_generic)} if k.startswith(self.field_generic)}
exact_lookup = 'date' if isinstance(field, models.DateTimeField) else 'exact'
# links as: (label, param, input_type|None, value) # links as: (label, param, input_type|None, value)
self.links = [(_('Exact'), self.field_generic + 'exact', self.input_type), self.links = [(_('Exact'), self.field_generic + exact_lookup, self.input_type),
(_('Since'), self.field_generic + 'gte', self.input_type), (_('Since'), self.field_generic + 'gte', self.input_type),
(_('Until'), self.field_generic + 'lte', self.input_type)] (_('Until'), self.field_generic + 'lte', self.input_type)]
if field.null: if field.null:

2
aircox/locale/fr/LC_MESSAGES/django.po
View File

@ -264,7 +264,7 @@ msgstr "catégorie"
#: aircox/models/page.py:165 #: aircox/models/page.py:165
msgid "publication date" msgid "publication date"
msgstr "date de publications" msgstr "date de publication"
#: aircox/models/page.py:167 #: aircox/models/page.py:167
msgid "featured" msgid "featured"

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

@ -10,9 +10,9 @@
onsubmit="return this.{{ choice.name }}.value ? true : false""> onsubmit="return this.{{ choice.name }}.value ? true : false"">
<label for="filter-{{ choice.name }}">{{ choice.label }}: </label> <label for="filter-{{ choice.name }}">{{ choice.label }}: </label>
<input id="filter-{{ choice.name }}" type="{{ choice.type }}" name="{{ choice.name }}" <input id="filter-{{ choice.name }}" type="{{ choice.type }}" name="{{ choice.name }}"
value="{{ choice.value }}" {{ choice.extra }} /> value="{{ choice.value }}" {{ choice.extra }}/>
{% for k, v in choice.query_attrs.items %} {% for k, v in choice.query_attrs.items %}
<input type="hidden" name="{{k}}" value="{{v}}" /> <input type="hidden" name="{{k}}" value="{{v}}"/>
{% endfor %} {% endfor %}
<button class="button"><img src="{% static "admin/img/search.svg" %}" /></button> <button class="button"><img src="{% static "admin/img/search.svg" %}" /></button>
</form> </form>