Briq
/
django-admin-interface
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix date hierarchy params. #374 (#375) 

* #374: Date hierarchy params fix

* #374: Backwards compatible changes
master
Jeroen Peters 2024-03-07 09:49:44 +01:00 committed by GitHub
parent 6f7f6018bf
commit b1bb5d0437
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin_interface/templatetags/admin_interface_tags.py
View File

@ -144,15 +144,20 @@ def admin_interface_date_hierarchy_removal_link(changelist, date_field_name):
params = changelist.get_filters_params() params = changelist.get_filters_params()
date_params = [p for p in params if p.startswith(date_field_name)] date_params = [p for p in params if p.startswith(date_field_name)]
date_args = [int(params[f"{date_field_name}__year"]), 1, 1] date_args = [datetime.datetime.now().year, 1, 1]
year = params.get(f"{date_field_name}__year")
if year:
date_args[0] = int(year[0]) if isinstance(year, list) else int(year)
date_format = "Y" date_format = "Y"
if f"{date_field_name}__month" in params: if f"{date_field_name}__month" in params:
date_args[1] = int(params[f"{date_field_name}__month"]) month = params[f"{date_field_name}__month"]
date_args[1] = int(month[0]) if isinstance(month, list) else int(month)
date_format = "YEAR_MONTH_FORMAT" date_format = "YEAR_MONTH_FORMAT"
if f"{date_field_name}__day" in params: if f"{date_field_name}__day" in params:
date_args[2] = int(params[f"{date_field_name}__day"]) day = params[f"{date_field_name}__day"]
date_args[2] = int(day[0]) if isinstance(day, list) else int(day)
date_format = "DATE_FORMAT" date_format = "DATE_FORMAT"
date_value = datetime.date(*date_args) date_value = datetime.date(*date_args)