Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2719 from matmair/fix-date-formats

Browse Source 
Fix render_date tag
This commit is contained in:
Oliver 2022-03-07 11:13:30 +11:00 committed by GitHub
commit 984e465b70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
InvenTree/part/templatetags/inventree_extras.py
View File

@ -5,7 +5,7 @@ This module provides template tags for extra functionality,
over and above the built-in Django tags.
"""
from datetime import date
from datetime import date, datetime
import os
import sys
@ -87,7 +87,9 @@ def render_date(context, date_object):
# Update the context cache
context['user_date_format'] = user_date_format
return date_object.strftime(user_date_format)
if isinstance(date_object, (datetime, date)):
return date_object.strftime(user_date_format)
return date_object
@register.simple_tag()