From 747ff7a30b79e12d344169200de24f88a22ddee9 Mon Sep 17 00:00:00 2001 From: humbertotm Date: Mon, 28 May 2018 19:59:03 -0700 Subject: Fixed #29385 -- Made admindocs ModelDetailView show model properties. Original patch by bkaluza. Tests and docs by humbertotm. --- tests/admin_docs/models.py | 4 ++++ tests/admin_docs/test_views.py | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'tests/admin_docs') diff --git a/tests/admin_docs/models.py b/tests/admin_docs/models.py index a425ae0fcd..02bf1efa9f 100644 --- a/tests/admin_docs/models.py +++ b/tests/admin_docs/models.py @@ -52,6 +52,10 @@ class Person(models.Model): def dummy_function(self, baz, rox, *some_args, **some_kwargs): return some_kwargs + @property + def a_property(self): + return 'a_property' + def suffix_company_name(self, suffix='ltd'): return self.company.name + suffix diff --git a/tests/admin_docs/test_views.py b/tests/admin_docs/test_views.py index c55891a3c0..05e1f6b329 100644 --- a/tests/admin_docs/test_views.py +++ b/tests/admin_docs/test_views.py @@ -208,6 +208,10 @@ class TestModelDetailView(TestDataMixin, AdminDocsTestCase): """ self.assertContains(self.response, "baz, rox, *some_args, **some_kwargs") + def test_instance_of_property_methods_are_displayed(self): + """Model properties are displayed as fields.""" + self.assertContains(self.response, 'a_property') + def test_method_data_types(self): company = Company.objects.create(name="Django") person = Person.objects.create(first_name="Human", last_name="User", company=company) -- cgit v1.3