[1.0.X] Fixed #9053 -- Allowed for sorting of callable and ModelAdmin methods specified in list_display (added in r8352). Previously attempting to sort on the former would raise an exception and the latter simply didn't sort. Also added tests for this function. Thanks rgl and jenan.

Backport of [9211], also updated svnmerge.py metatdata.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9212 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 13 insertions, 1 deletions

diff --git a/tests/regressiontests/admin_views/models.py b/tests/regressiontests/admin_views/models.py
index 98f99a6d00..52e75699ea 100644
--- a/tests/regressiontests/admin_views/models.py
+++ b/tests/regressiontests/admin_views/models.py
@@ -19,12 +19,20 @@ class Article(models.Model):
 
     def __unicode__(self):
         return self.title
+    
+    def model_year(self):
+        return self.date.year
+    model_year.admin_order_field = 'date'
+
+def callable_year(dt_value):
+    return dt_value.year
+callable_year.admin_order_field = 'date'
 
 class ArticleInline(admin.TabularInline):
     model = Article
 
 class ArticleAdmin(admin.ModelAdmin):
-    list_display = ('content', 'date')
+    list_display = ('content', 'date', callable_year, 'model_year', 'modeladmin_year')
     list_filter = ('date',)
 
     def changelist_view(self, request):
@@ -34,6 +42,10 @@ class ArticleAdmin(admin.ModelAdmin):
                 'extra_var': 'Hello!'
             }
         )
+        
+    def modeladmin_year(self, obj):
+        return obj.date.year
+    modeladmin_year.admin_order_field = 'date'
 
 class CustomArticle(models.Model):
     content = models.TextField()