summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gaevsky <sasha@sasha0.ru>2016-01-08 22:51:52 +0200
committerTim Graham <timograham@gmail.com>2016-01-08 17:26:33 -0500
commitcaeacd94ddc7fa8e7e408ad252cfff4601d502c4 (patch)
tree7bacb5beaf3c5113b0d42aa5bdd309f243d5d002
parentf8c3d38c2d26f99ca620d76a0d88b69eeeb88c2c (diff)
[1.8.x] Refs #24980 -- Fixed incorrect timezone handling in admin calendar widget.
Backport of ea7542891a4e3638a695c58bd6f00658b7c85985 from master
-rw-r--r--django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js b/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js
index faec5a49af..8d50046817 100644
--- a/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js
+++ b/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js
@@ -292,8 +292,8 @@ var DateTimeShortcuts = {
if (inp.value) {
var format = get_format('DATE_INPUT_FORMATS')[0];
var selected = inp.value.strptime(format);
- var year = selected.getFullYear();
- var month = selected.getMonth() + 1;
+ var year = selected.getUTCFullYear();
+ var month = selected.getUTCMonth() + 1;
var re = /\d{4}/
if (re.test(year.toString()) && month >= 1 && month <= 12) {
DateTimeShortcuts.calendars[num].drawDate(month, year, selected);