openstack
/
horizon
Code Issues Proposed changes

Merge "take time zone into account"

This commit is contained in:
Jenkins 2016-11-18 19:04:42 +00:00 committed by Gerrit Code Review
parent 1a3ab89f22 4b1cb06f95
commit 19a659cc30
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack_dashboard/dashboards/settings/user/views.py
View File

@ -31,6 +31,7 @@ class UserSettingsView(forms.ModalFormView):
template_name = 'settings/user/settings.html'
def get_initial(self):
default_tz = getattr(settings, 'TIME_ZONE', 'UTC')
return {
'language': self.request.session.get(
settings.LANGUAGE_COOKIE_NAME,
@ -38,7 +39,7 @@ class UserSettingsView(forms.ModalFormView):
self.request.LANGUAGE_CODE)),
'timezone': self.request.session.get(
'django_timezone',
self.request.COOKIES.get('django_timezone', 'UTC')),
self.request.COOKIES.get('django_timezone', default_tz)),
'pagesize': utils.get_page_size(self.request),
'instance_log_length': utils.get_log_length(self.request)}