extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2024-12-12 18:00:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #948 from alligatorbait/master

Browse Source 
String Check, catch NoneType error
This commit is contained in:
Garret Wassermann 2021-02-24 10:57:21 -05:00 committed by GitHub
commit 78a027b5a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
helpdesk/templatetags/helpdesk_util.py
View File

@ -23,12 +23,13 @@ def datetime_string_format(value):
""" """
try: try:
new_value = date_filter(datetime.strptime(value, CUSTOMFIELD_DATETIME_FORMAT), settings.DATETIME_FORMAT) new_value = date_filter(datetime.strptime(value, CUSTOMFIELD_DATETIME_FORMAT), settings.DATETIME_FORMAT)
except ValueError: except (TypeError, ValueError):
try: try:
new_value = date_filter(datetime.strptime(value, CUSTOMFIELD_DATE_FORMAT), settings.DATE_FORMAT) new_value = date_filter(datetime.strptime(value, CUSTOMFIELD_DATE_FORMAT), settings.DATE_FORMAT)
except ValueError: except (TypeError, ValueError):
try: try:
new_value = date_filter(datetime.strptime(value, CUSTOMFIELD_TIME_FORMAT), settings.TIME_FORMAT) new_value = date_filter(datetime.strptime(value, CUSTOMFIELD_TIME_FORMAT), settings.TIME_FORMAT)
except ValueError: except (TypeError, ValueError):
new_value = value # If NoneType return empty string, else return original value
new_value = "" if value is None else value
return new_value return new_value