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:22:47 -0500
commit835fff47322bafcd57906601b8ba8675b2d762d5 (patch)
treece535c17f02bf5add393f267066ee93357e6dbee
parent3d324b9614afa1e9b391b30f6f21d2f65fa8ac90 (diff)
[1.9.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 bc7e1879e3..1943935309 100644
--- a/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js
+++ b/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js
@@ -297,8 +297,8 @@
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);