[FIX] HORILLA VIEWS: selected_format filter add default date and time format fallback

This commit is contained in:
Horilla
2025-06-06 14:54:50 +05:30
parent a362c5580e
commit 266273ccbf

View File

@@ -46,14 +46,16 @@ time_format_mapping = {
@register.filter(name="selected_format") @register.filter(name="selected_format")
def selected_format(date: datetime.date, company: object = None) -> str: def selected_format(date: datetime.date, company: object = None) -> str:
if company and (company.date_format or company.time_format): if isinstance(date, datetime.date):
if isinstance(date, datetime.date): format = (
format = company.date_format company.date_format if company and company.date_format else "MMM. D, YYYY"
date_format_mapping.get(format) )
return date.strftime(date_format_mapping[format]) strftime_format = date_format_mapping.get(format, "%b. %d, %Y")
elif isinstance(date, datetime.time): return date.strftime(strftime_format)
format = company.time_format elif isinstance(date, datetime.time):
return date.strftime(time_format_mapping[format]) format = company.time_format if company and company.time_format else "hh:mm A"
strftime_format = time_format_mapping.get(format, "%I:%M %p")
return date.strftime(strftime_format)
return date return date