From fa54a87641670e72df964fe5c4157c6fd3356a08 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 23 Dec 2020 08:54:21 +0100
Subject: [PATCH] Bugfix handling empty setting

---
 VIPSWeb/templatetags/template_helper.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/VIPSWeb/templatetags/template_helper.py b/VIPSWeb/templatetags/template_helper.py
index be15de32..792005e1 100755
--- a/VIPSWeb/templatetags/template_helper.py
+++ b/VIPSWeb/templatetags/template_helper.py
@@ -145,14 +145,11 @@ def get_text_i18n(text_dict):
 
 @register.simple_tag
 def get_system_time(format_string):
-	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)
+
+	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")
+	else:
+		time = datetime.now() + relativedelta(months = settings.SYSTEM_TIME_OFFSET_MONTHS)
 	return time.strftime(format_string)
 
 @register.filter
-- 
GitLab