mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-08 17:37:20 +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
Show Stats 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() { init: function() {
var body = document.getElementsByTagName('body')[0]; var body = document.getElementsByTagName('body')[0];
var serverOffset = body.getAttribute('data-admin-utc-offset'); var serverOffset = body.getAttribute('data-admin-utc-offset');
if (serverOffset !== undefined) { if (serverOffset) {
var localOffset = new Date().getTimezoneOffset() * -60; var localOffset = new Date().getTimezoneOffset() * -60;
DateTimeShortcuts.timezoneOffset = localOffset - serverOffset; DateTimeShortcuts.timezoneOffset = localOffset - serverOffset;
} }
@ -43,7 +43,7 @@
now: function() { now: function() {
var body = document.getElementsByTagName('body')[0]; var body = document.getElementsByTagName('body')[0];
var serverOffset = body.getAttribute('data-admin-utc-offset'); var serverOffset = body.getAttribute('data-admin-utc-offset');
if (serverOffset !== undefined) { if (serverOffset) {
var localNow = new Date(); var localNow = new Date();
var localOffset = localNow.getTimezoneOffset() * -60; var localOffset = localNow.getTimezoneOffset() * -60;
localNow.setTime(localNow.getTime() + 1000 * (serverOffset - localOffset)); localNow.setTime(localNow.getTime() + 1000 * (serverOffset - localOffset));

4
docs/releases/1.9.1.txt
View File

@ -46,3 +46,7 @@ Bugfixes
* Fixed ``TypedChoiceField`` change detection with nullable fields * Fixed ``TypedChoiceField`` change detection with nullable fields
(:ticket:`25942`). (:ticket:`25942`).
* Fixed incorrect timezone warnings in custom admin templates that don't have
a ``data-admin-utc-offset`` attribute in the ``body`` tag.
(:ticket:`25845`).

4
js_tests/admin/DateTimeShortcuts.test.js
View File

@ -16,4 +16,8 @@ test('init', function(assert) {
assert.equal(shortcuts.length, 1); assert.equal(shortcuts.length, 1);
assert.equal(shortcuts.find('a:first').text(), 'Today'); assert.equal(shortcuts.find('a:first').text(), 'Today');
assert.equal(shortcuts.find('a:last .date-icon').length, 1); assert.equal(shortcuts.find('a:last .date-icon').length, 1);
// To prevent incorrect timezone warnings on date/time widgets, timezoneOffset
// should be 0 when a timezone offset isn't set in the HTML body attribute.
assert.equal(DateTimeShortcuts.timezoneOffset, 0);
}); });