Commit 88c605e3 authored by david's avatar david Committed by Erik Romijn
Browse files

Fixed #23993 -- Added form.media to the admin login template.

parent ec808e80

django/contrib/admin/templates/admin/login.html

+3 −1
Original line number Diff line number Diff line 
{% extends "admin/base_site.html" %}

{% load i18n admin_static %}



{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/login.css" %}" />{% endblock %}

{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/login.css" %}" />

{{ form.media }}

{% endblock %}



{% block bodyclass %}{{ block.super }} login{% endblock %}

tests/admin_views/forms.py

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ from django.contrib.admin.forms import AdminAuthenticationForm 


class CustomAdminAuthenticationForm(AdminAuthenticationForm):



    class Media:

        css = {'all': ('path/to/media.css',)}



    def clean_username(self):

        username = self.cleaned_data.get('username')

        if username == 'customform':

tests/admin_views/tests.py

+1 −0
Original line number Diff line number Diff line
@@ -1182,6 +1182,7 @@ class CustomModelAdminTest(AdminViewBasicTestCase): 
        self.assertIsInstance(login, TemplateResponse)

        self.assertEqual(login.status_code, 200)

        self.assertContains(login, 'custom form error')

        self.assertContains(login, 'path/to/media.css')



    def test_custom_admin_site_login_template(self):

        self.client.logout()