Author: kmtracey
Date: 2010-03-16 11:10:27 -0500 (Tue, 16 Mar 2010)
New Revision: 12794
Modified:
django/trunk/django/forms/forms.py
django/trunk/tests/regressiontests/admin_views/models.py
Log:
Fixed #12434: Made pretty_name handle empty string and None as input. Thanks
ales_zoulek and gabrielhurley.
Modified: django/trunk/django/forms/forms.py
===================================================================
--- django/trunk/django/forms/forms.py 2010-03-16 14:40:03 UTC (rev 12793)
+++ django/trunk/django/forms/forms.py 2010-03-16 16:10:27 UTC (rev 12794)
@@ -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):
"""
Modified: django/trunk/tests/regressiontests/admin_views/models.py
===================================================================
--- django/trunk/tests/regressiontests/admin_views/models.py 2010-03-16
14:40:03 UTC (rev 12793)
+++ django/trunk/tests/regressiontests/admin_views/models.py 2010-03-16
16:10:27 UTC (rev 12794)
@@ -35,6 +35,7 @@
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 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()
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
