Commit cc6e9b22 authored by Karen Tracey's avatar Karen Tracey
Browse files

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

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
parent 3c59067a

django/forms/forms.py

+4 −3
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ __all__ = ('BaseForm', 'Form') 
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):

    """

tests/regressiontests/admin_views/models.py

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ class Article(models.Model): 
    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 @@ class ArticleAdmin(admin.ModelAdmin): 
    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()