From de791bbd2ca08a423fdc11540e76e5c16a8b43af Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Wed, 23 Dec 2020 08:50:19 +0100 Subject: [PATCH] Handling empty settings.SYSTEM_TIME_EXACT --- VIPSWeb/templatetags/template_helper.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/VIPSWeb/templatetags/template_helper.py b/VIPSWeb/templatetags/template_helper.py index 87200f63..be15de32 100755 --- a/VIPSWeb/templatetags/template_helper.py +++ b/VIPSWeb/templatetags/template_helper.py @@ -145,10 +145,14 @@ def get_text_i18n(text_dict): @register.simple_tag def get_system_time(format_string): - if(settings.SYSTEM_TIME_EXACT != None and settings.SYSTEM_TIME_EXACT.strip() != ""): - time = datetime.strptime(settings.SYSTEM_TIME_EXACT,"%Y-%m-%d") - else: - time = datetime.now() + relativedelta(months = settings.SYSTEM_TIME_OFFSET_MONTHS) + try: + if(settings.SYSTEM_TIME_EXACT != None and settings.SYSTEM_TIME_EXACT.strip() != ""): + time = datetime.strptime(settings.SYSTEM_TIME_EXACT,"%Y-%m-%d") + return time.strftime(format_string) + except NameError: + pass + + time = datetime.now() + relativedelta(months = settings.SYSTEM_TIME_OFFSET_MONTHS) return time.strftime(format_string) @register.filter -- GitLab