From 710de1ebbdbf5fdd025f0f9e3f8549e1e25bcd50 Mon Sep 17 00:00:00 2001 From: "Mr. Senko" Date: Mon, 25 Nov 2019 23:55:45 +0200 Subject: [PATCH] Show current server time in navbar. Refs #545, #1206 by default Kiwi TCMS is configured for UTC time and this is confusing some users. All timestamps are displayed according to configured timezone. --- tcms/core/context_processors.py | 5 +++++ tcms/settings/common.py | 1 + tcms/templates/navbar.html | 10 ++++++++++ 3 files changed, 16 insertions(+) diff --git a/tcms/core/context_processors.py b/tcms/core/context_processors.py index 042e08fba7..4e986b4cd9 100644 --- a/tcms/core/context_processors.py +++ b/tcms/core/context_processors.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- from django.conf import settings +from django.utils import timezone def request_contents_processor(request): @@ -14,3 +15,7 @@ def settings_processor(_request): Django settings RequestContext Handler """ return {'SETTINGS': settings} + + +def server_time_processor(_request): + return {'SERVER_TIME': timezone.now() } diff --git a/tcms/settings/common.py b/tcms/settings/common.py index 7879fbb3c2..4fc599ee44 100644 --- a/tcms/settings/common.py +++ b/tcms/settings/common.py @@ -276,6 +276,7 @@ 'tcms.core.context_processors.request_contents_processor', 'tcms.core.context_processors.settings_processor', + 'tcms.core.context_processors.server_time_processor', ], 'loaders': [ 'django.template.loaders.filesystem.Loader', diff --git a/tcms/templates/navbar.html b/tcms/templates/navbar.html index d3da75d289..71aa874438 100644 --- a/tcms/templates/navbar.html +++ b/tcms/templates/navbar.html @@ -1,5 +1,6 @@ {% load i18n %} {% load static %} +{% load tz %}