diff options
| author | Gavin Wahl <gwahl@fusionbox.com> | 2015-09-15 11:46:03 -0600 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-09-16 13:16:21 -0400 |
| commit | 0603f09318049e67320121ace035b7ab03f88ca3 (patch) | |
| tree | 20e48a595fff07a9cdbc11b7ac5fdce6bd321987 | |
| parent | b0c56b895fd2694d7f5d4595bdbbc41916607f45 (diff) | |
Refs #25149 -- Fixed regression in admin datetime widget for timezones on the negative side of UTC.
| -rw-r--r-- | django/contrib/admin/templates/admin/base.html | 2 | ||||
| -rw-r--r-- | tests/admin_widgets/tests.py | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html index fa6ee41b08..ad8663f00d 100644 --- a/django/contrib/admin/templates/admin/base.html +++ b/django/contrib/admin/templates/admin/base.html @@ -12,7 +12,7 @@ {% load i18n %} <body class="{% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}" - data-admin-utc-offset="{% filter escapejs %}{% now "Z" %}{% endfilter %}"> + data-admin-utc-offset="{% now "Z" %}"> <!-- Container --> <div id="container"> diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py index 8572db508a..571816a632 100644 --- a/tests/admin_widgets/tests.py +++ b/tests/admin_widgets/tests.py @@ -884,6 +884,21 @@ class DateTimePickerShortcutsSeleniumIETests(DateTimePickerShortcutsSeleniumFire webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver' +# The above tests run with Asia/Singapore which are on the positive side of +# UTC. Here we test with a timezone on the negative side. +@override_settings(TIME_ZONE='US/Eastern') +class DateTimePickerAltTimezoneSeleniumFirefoxTests(DateTimePickerShortcutsSeleniumFirefoxTests): + pass + + +class DateTimePickerAltTimezoneSeleniumChromeTests(DateTimePickerAltTimezoneSeleniumFirefoxTests): + webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver' + + +class DateTimePickerAltTimezoneSeleniumIETests(DateTimePickerAltTimezoneSeleniumFirefoxTests): + webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver' + + @override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'], ROOT_URLCONF='admin_widgets.urls') class HorizontalVerticalFilterSeleniumFirefoxTests(SeleniumDataMixin, AdminSeleniumWebDriverTestCase): |