Skip to content
Snippets Groups Projects
Commit fa54a876 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Bugfix handling empty setting

parent de791bbd
Branches
No related tags found
No related merge requests found
...@@ -145,14 +145,11 @@ def get_text_i18n(text_dict): ...@@ -145,14 +145,11 @@ def get_text_i18n(text_dict):
@register.simple_tag @register.simple_tag
def get_system_time(format_string): def get_system_time(format_string):
try:
if(settings.SYSTEM_TIME_EXACT != None and settings.SYSTEM_TIME_EXACT.strip() != ""): if(hasattr(settings, "SYSTEM_TIME_EXACT") and settings.SYSTEM_TIME_EXACT != None and settings.SYSTEM_TIME_EXACT.strip() != ""):
time = datetime.strptime(settings.SYSTEM_TIME_EXACT,"%Y-%m-%d") time = datetime.strptime(settings.SYSTEM_TIME_EXACT,"%Y-%m-%d")
return time.strftime(format_string) else:
except NameError: time = datetime.now() + relativedelta(months = settings.SYSTEM_TIME_OFFSET_MONTHS)
pass
time = datetime.now() + relativedelta(months = settings.SYSTEM_TIME_OFFSET_MONTHS)
return time.strftime(format_string) return time.strftime(format_string)
@register.filter @register.filter
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment