Commit dc3d2ac9 authored by Christopher Medrela's avatar Christopher Medrela Committed by Tim Graham
Browse files

Fixed #11277 -- Hid labels of fields with HiddenInput widget in admin forms. 

Thanks bartTC for the report.
parent bcd4c3f2

django/contrib/admin/helpers.py

+3 −0
Original line number Diff line number Diff line
@@ -84,6 +84,9 @@ class Fieldline(object): 
            self.fields = [field]

        else:

            self.fields = field

        self.has_visible_field = not all(field in self.form.fields and

                                         self.form.fields[field].widget.is_hidden

                                         for field in self.fields)

        self.model_admin = model_admin

        if readonly_fields is None:

            readonly_fields = ()

django/contrib/admin/static/admin/css/forms.css

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ form .form-row p { 
    font-size: 11px;

}



.hidden {

    display: none;

}



/* FORM LABELS */



form h4 {

django/contrib/admin/templates/admin/includes/fieldset.html

+2 −2
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ 
        <div class="description">{{ fieldset.description|safe }}</div>

    {% endif %}

    {% for line in fieldset %}

        <div class="form-row{% if line.fields|length_is:'1' and line.errors %} errors{% endif %}{% for field in line %}{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% endfor %}">

        <div class="form-row{% if line.fields|length_is:'1' and line.errors %} errors{% endif %}{% if not line.has_visible_field %} hidden{% endif %}{% for field in line %}{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% endfor %}">

            {% if line.fields|length_is:'1' %}{{ line.errors }}{% endif %}

            {% for field in line %}

                <div{% if not line.fields|length_is:'1' %} class="field-box{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% if not field.is_readonly and field.errors %} errors{% endif %}"{% elif field.is_checkbox %} class="checkbox-row"{% endif %}>

                <div{% if not line.fields|length_is:'1' %} class="field-box{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% if not field.is_readonly and field.errors %} errors{% endif %}{% if field.field.is_hidden %} hidden{% endif %}"{% elif field.is_checkbox %} class="checkbox-row"{% endif %}>

                    {% if not line.fields|length_is:'1' and not field.is_readonly %}{{ field.errors }}{% endif %}

                    {% if field.is_checkbox %}

                        {{ field.field }}{{ field.label_tag }}

tests/admin_views/admin.py

+35 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ from .models import (Article, Chapter, Account, Media, Child, Parent, Picture, 
    AdminOrderedField, AdminOrderedModelMethod, AdminOrderedAdminMethod,

    AdminOrderedCallable, Report, Color2, UnorderedObject, MainPrepopulated,

    RelatedPrepopulated, UndeletableObject, UnchangeableObject, UserMessenger, Simple, Choice,

    ShortMessage, Telegram, FilteredManager)

    ShortMessage, Telegram, FilteredManager, EmptyModelHidden,

    EmptyModelVisible, EmptyModelMixin)





def callable_year(dt_value):
@@ -709,6 +710,36 @@ class ChoiceList(admin.ModelAdmin): 
    fields = ['choice']





# Tests for ticket 11277 ----------------------------------



class FormWithoutHiddenField(forms.ModelForm):

    first = forms.CharField()

    second = forms.CharField()



class FormWithoutVisibleField(forms.ModelForm):

    first = forms.CharField(widget=forms.HiddenInput)

    second = forms.CharField(widget=forms.HiddenInput)



class FormWithVisibleAndHiddenField(forms.ModelForm):

    first = forms.CharField(widget=forms.HiddenInput)

    second = forms.CharField()



class EmptyModelVisibleAdmin(admin.ModelAdmin):

    form = FormWithoutHiddenField

    fieldsets = (

        (None, {

            'fields':(('first', 'second'),),

        }),

    )



class EmptyModelHiddenAdmin(admin.ModelAdmin):

    form = FormWithoutVisibleField

    fieldsets = EmptyModelVisibleAdmin.fieldsets



class EmptyModelMixinAdmin(admin.ModelAdmin):

    form = FormWithVisibleAndHiddenField

    fieldsets = EmptyModelVisibleAdmin.fieldsets



site = admin.AdminSite(name="admin")

site.register(Article, ArticleAdmin)

site.register(CustomArticle, CustomArticleAdmin)
@@ -790,6 +821,9 @@ site.register(Color2, CustomTemplateFilterColorAdmin) 
site.register(Simple, AttributeErrorRaisingAdmin)

site.register(UserMessenger, MessageTestingAdmin)

site.register(Choice, ChoiceList)

site.register(EmptyModelHidden, EmptyModelHiddenAdmin)

site.register(EmptyModelVisible, EmptyModelVisibleAdmin)

site.register(EmptyModelMixin, EmptyModelMixinAdmin)



# Register core models we need in our tests

from django.contrib.auth.models import User, Group

tests/admin_views/models.py

+9 −0
Original line number Diff line number Diff line
@@ -704,3 +704,12 @@ class FilteredManager(models.Model): 


    pk_gt_1 = _Manager()

    objects = models.Manager()



class EmptyModelVisible(models.Model):

    """ See ticket #11277. """



class EmptyModelHidden(models.Model):

    """ See ticket #11277. """



class EmptyModelMixin(models.Model):

    """ See ticket #11277. """