openstack
/
horizon
Code Issues Proposed changes

Fix ignored timezone value from local_settings 

When django_timezone not set in session or cookie,
default value is taken from the settings file but in there
has to be looked as TIME_ZONE

Change-Id: Idf93084f654ab65a2ed0dba7bc583147210cf175
Closes-bug: #1660648
This commit is contained in:
Mateusz Kowalski 2017-02-01 10:05:29 +01:00
parent 4f654e30c3
commit 18bd068ef1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
horizon/utils/functions.py
View File

@ -107,7 +107,11 @@ def get_log_length(request):
def get_timezone(request):
return get_config_value(request, 'django_timezone', 'UTC')
# Session and cookie store timezone as django_timezone.
# In case there is no timezone neither in session nor cookie
# use default value from settings file where it's called TIME_ZONE
return get_config_value(request, 'django_timezone',
getattr(settings, 'TIME_ZONE', 'UTC'))
def get_language(request):