Commit 692902b2 authored by Honza Král's avatar Honza Král
Browse files

Merge pull request #778 from viciu/19609 

Fixed #19609: admin Inlines doesn't display help_text for readonly fields
parents ef1e6ef1 67dd54dc

AUTHORS

+2 −0
Original line number Diff line number Diff line
@@ -590,6 +590,8 @@ answer newbie questions, and generally made Django that much better: 
    ye7cakf02@sneakemail.com

    ymasuda@ethercube.com

    Jesse Young <adunar@gmail.com>

    Marc Aymerich Gubern

    Wiktor Kołodziej <wiktor@pykonik.org>

    Mykola Zamkovoi <nickzam@gmail.com>

    zegor

    Gasper Zejn <zejn@kiberpipa.org>

django/contrib/admin/helpers.py

+7 −6
Original line number Diff line number Diff line
@@ -224,19 +224,20 @@ class InlineAdminFormSet(object): 


    def fields(self):

        fk = getattr(self.formset, "fk", None)

        for i, field in enumerate(flatten_fieldsets(self.fieldsets)):

            if fk and fk.name == field:

        for i, field_name in enumerate(flatten_fieldsets(self.fieldsets)):

            if fk and fk.name == field_name:

                continue

            if field in self.readonly_fields:

            if field_name in self.readonly_fields:

                yield {

                    'label': label_for_field(field, self.opts.model, self.opts),

                    'label': label_for_field(field_name, self.opts.model, self.opts),

                    'widget': {

                        'is_hidden': False

                    },

                    'required': False

                    'required': False,

                    'help_text': help_text_for_field(field_name, self.opts.model),

                }

            else:

                yield self.formset.form.base_fields[field]

                yield self.formset.form.base_fields[field_name]



    def _media(self):

        media = self.opts.media + self.formset.media

tests/regressiontests/admin_inlines/admin.py

+6 −1
Original line number Diff line number Diff line
@@ -28,6 +28,11 @@ class HolderAdmin(admin.ModelAdmin): 
        js = ('my_awesome_admin_scripts.js',)





class ReadOnlyInlineInline(admin.TabularInline):

    model = ReadOnlyInline

    readonly_fields = ['name']





class InnerInline2(admin.StackedInline):

    model = Inner2
@@ -142,7 +147,7 @@ site.register(Novel, NovelAdmin) 
site.register(Fashionista, inlines=[InlineWeakness])

site.register(Holder4, Holder4Admin)

site.register(Author, AuthorAdmin)

site.register(CapoFamiglia, inlines=[ConsigliereInline, SottoCapoInline])

site.register(CapoFamiglia, inlines=[ConsigliereInline, SottoCapoInline, ReadOnlyInlineInline])

site.register(ProfileCollection, inlines=[ProfileInline])

site.register(ParentModelWithCustomPk, inlines=[ChildModel1Inline, ChildModel2Inline])

site.register(ExtraTerrestrial, inlines=[SightingInline])

tests/regressiontests/admin_inlines/models.py

+7 −2
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ class Novel(models.Model): 
class Chapter(models.Model):

    novel = models.ForeignKey(Novel)





# Models for #16838



class CapoFamiglia(models.Model):
@@ -138,7 +137,7 @@ class CapoFamiglia(models.Model): 




class Consigliere(models.Model):

    name = models.CharField(max_length=100)

    name = models.CharField(max_length=100, help_text='Help text for Consigliere')

    capo_famiglia = models.ForeignKey(CapoFamiglia, related_name='+')
@@ -146,6 +145,12 @@ class SottoCapo(models.Model): 
    name = models.CharField(max_length=100)

    capo_famiglia = models.ForeignKey(CapoFamiglia, related_name='+')





class ReadOnlyInline(models.Model):

    name = models.CharField(max_length=100, help_text='Help text for ReadOnlyInline')

    capo_famiglia = models.ForeignKey(CapoFamiglia)





# Models for #18433



class ParentModelWithCustomPk(models.Model):

tests/regressiontests/admin_inlines/tests.py

+4 −0
Original line number Diff line number Diff line
@@ -122,6 +122,10 @@ class TestInline(TestCase): 
        response = self.client.get('/admin/admin_inlines/holder4/add/')

        self.assertContains(response, '<p class="help">Awesome stacked help text is awesome.</p>', 4)

        self.assertContains(response, '<img src="/static/admin/img/icon-unknown.gif" class="help help-tooltip" width="10" height="10" alt="(Awesome tabular help text is awesome.)" title="Awesome tabular help text is awesome." />', 1)

        # ReadOnly fields

        response = self.client.get('/admin/admin_inlines/capofamiglia/add/')

        self.assertContains(response, '<img src="/static/admin/img/icon-unknown.gif" class="help help-tooltip" width="10" height="10" alt="(Help text for ReadOnlyInline)" title="Help text for ReadOnlyInline" />', 1)





    def test_non_related_name_inline(self):

        """