Changeset 8132 breaks labels on ForeignKey Fields

[arne]

The change in r8132 leads to empty labels in the admin change-forms if the ForeignKey Fields don't have an verbose_name parameter set.

To reproduce just create two models:

class ModelA(models.Model):
    title = models.CharField(max_length=20)

class ModelB(models.Model):
    foo = models.ForeignKey(ModelA)

and register the models with the admin app

class ModelAadmin(admin.ModelAdmin):
    pass

class ModelBadmin(admin.ModelAdmin):
    pass

admin.site.register(ModelA, ModelAadmin)
admin.site.register(ModelB, ModelBadmin)

In the Admin Change-Form of ModelB an empty label is displayed on the ForeignKeyField to ModelA (only a ":" displayed, expected output would be "Model a:")

The following patch fixes the problem, but I'm not sure if it breaks the problem which should be fixed by r8132 which was reported in #8011

--- db/models/fields/related.py	(revision 8137)
+++ db/models/fields/related.py	(working copy)
@@ -117,7 +117,7 @@
 
     def set_attributes_from_rel(self):
         self.name = self.name or (self.rel.to._meta.object_name.lower() + '_' + self.rel.to._meta.pk.name)
-        if self.verbose_name is None:
+        if not self.verbose_name:
             self.verbose_name = self.rel.to._meta.verbose_name
         self.rel.field_name = self.rel.field_name or self.rel.to._meta.pk.name

[Alex Gaynor]

This is causing errors all over, see the buildbot.

[Malcolm Tredinnick]

Jacob beat me to it (thankfully). Fixed in [8138], by the looks of it.

[Jacob]

Milestone 1.0 beta deleted