1
0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00

Added a few force_unicode() calls around objects in the admin. Required for

Python 2.3 compatibility. Patch from nfg.

Refs #8151, #8153.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8236 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick
2008-08-08 18:07:33 +00:00
parent be4390f834
commit ab8965c428
3 changed files with 63 additions and 56 deletions

View File

@@ -3,7 +3,7 @@ from django.contrib import admin
class Section(models.Model):
"""
A simple section that links to articles, to test linking to related items
A simple section that links to articles, to test linking to related items
in admin views.
"""
name = models.CharField(max_length=100)
@@ -12,14 +12,18 @@ class Article(models.Model):
"""
A simple article to test admin views. Test backwards compatibility.
"""
title = models.CharField(max_length=100)
content = models.TextField()
date = models.DateTimeField()
section = models.ForeignKey(Section)
def __unicode__(self):
return self.title
class ArticleAdmin(admin.ModelAdmin):
list_display = ('content', 'date')
list_filter = ('date',)
def changelist_view(self, request):
"Test that extra_context works"
return super(ArticleAdmin, self).changelist_view(
@@ -40,7 +44,7 @@ class CustomArticleAdmin(admin.ModelAdmin):
change_form_template = 'custom_admin/change_form.html'
object_history_template = 'custom_admin/object_history.html'
delete_confirmation_template = 'custom_admin/delete_confirmation.html'
def changelist_view(self, request):
"Test that extra_context works"
return super(CustomArticleAdmin, self).changelist_view(
@@ -51,10 +55,10 @@ class CustomArticleAdmin(admin.ModelAdmin):
class ModelWithStringPrimaryKey(models.Model):
id = models.CharField(max_length=255, primary_key=True)
def __unicode__(self):
return self.id
admin.site.register(Article, ArticleAdmin)
admin.site.register(CustomArticle, CustomArticleAdmin)
admin.site.register(Section)