Commit 0603f093 authored by Gavin Wahl's avatar Gavin Wahl Committed by Tim Graham
Browse files

Refs #25149 -- Fixed regression in admin datetime widget for timezones on the negative side of UTC.

parent b0c56b89

django/contrib/admin/templates/admin/base.html

+1 −1
Original line number Diff line number Diff line
@@ -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">

tests/admin_widgets/tests.py

+15 −0
Original line number Diff line number Diff line
@@ -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):