mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #25845 -- Fixed incorrect timezone warnings in custom admin templates.

Browse Source
This commit is contained in:
Sven Grunewaldt
2015-12-16 15:11:00 +01:00
committed by Tim Graham
parent d91cc25a2a
commit 9af40f5df1
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js
View File

@@ -21,7 +21,7 @@
init: function() {
var body = document.getElementsByTagName('body')[0];
var serverOffset = body.getAttribute('data-admin-utc-offset');
if (serverOffset !== undefined) {
if (serverOffset) {
var localOffset = new Date().getTimezoneOffset() * -60;
DateTimeShortcuts.timezoneOffset = localOffset - serverOffset;
}
@@ -43,7 +43,7 @@
now: function() {
var body = document.getElementsByTagName('body')[0];
var serverOffset = body.getAttribute('data-admin-utc-offset');
if (serverOffset !== undefined) {
if (serverOffset) {
var localNow = new Date();
var localOffset = localNow.getTimezoneOffset() * -60;
localNow.setTime(localNow.getTime() + 1000 * (serverOffset - localOffset));