summaryrefslogtreecommitdiff
path: root/tests/admin_views
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2019-04-01 15:11:54 +0200
committerGitHub <noreply@github.com>2019-04-01 15:11:54 +0200
commit7cbcf2e2cbca1acfccfd973f746a9e6abfc0052e (patch)
treeb1872a31250529897a367910e582c9e42a75f2b7 /tests/admin_views
parent93daed25a41b5cf2f7804d91630caa1cd0786a9a (diff)
Fixed #30259 -- Fixed crash of admin views when properties don't have admin_order_field attribute.
Diffstat (limited to 'tests/admin_views')
-rw-r--r--tests/admin_views/admin.py2
-rw-r--r--tests/admin_views/models.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py
index 3e8df5b7c2..8f0aaf843f 100644
--- a/tests/admin_views/admin.py
+++ b/tests/admin_views/admin.py
@@ -104,7 +104,7 @@ class ArticleAdmin(admin.ModelAdmin):
list_display = (
'content', 'date', callable_year, 'model_year', 'modeladmin_year',
'model_year_reversed', 'section', lambda obj: obj.title,
- 'order_by_expression', 'model_property_year',
+ 'order_by_expression', 'model_property_year', 'model_month',
)
list_editable = ('section',)
list_filter = ('date', 'section')
diff --git a/tests/admin_views/models.py b/tests/admin_views/models.py
index aaf86ea1cd..9ac3c53bab 100644
--- a/tests/admin_views/models.py
+++ b/tests/admin_views/models.py
@@ -60,6 +60,10 @@ class Article(models.Model):
property_year.admin_order_field = 'date'
model_property_year = property(property_year)
+ @property
+ def model_month(self):
+ return self.date.month
+
class Book(models.Model):
"""