Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #12434: Made pretty_name handle empty string and None as input.…

… Thanks ales_zoulek and gabrielhurley.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit cc6e9b22864a0dd72bcc778ab3f673853ee4987d 1 parent 3c59067
@kmtracey kmtracey authored
View
7 django/forms/forms.py
@@ -18,9 +18,10 @@
NON_FIELD_ERRORS = '__all__'
def pretty_name(name):
- "Converts 'first_name' to 'First name'"
- name = name[0].upper() + name[1:]
- return name.replace('_', ' ')
+ """Converts 'first_name' to 'First name'"""
+ if not name:
+ return u''
+ return name.replace('_', ' ').capitalize()
def get_declared_fields(bases, attrs, with_base_fields=True):
"""
View
2  tests/regressiontests/admin_views/models.py
@@ -35,6 +35,7 @@ def __unicode__(self):
def model_year(self):
return self.date.year
model_year.admin_order_field = 'date'
+ model_year.short_description = ''
class Book(models.Model):
"""
@@ -103,6 +104,7 @@ def changelist_view(self, request):
def modeladmin_year(self, obj):
return obj.date.year
modeladmin_year.admin_order_field = 'date'
+ modeladmin_year.short_description = None
class CustomArticle(models.Model):
content = models.TextField()
Please sign in to comment.
Something went wrong with that request. Please try again.