summaryrefslogtreecommitdiff
path: root/tests/regressiontests/admin_views/admin.py
diff options
context:
space:
mode:
authorEmmanuelle Delescolle <emma@lasolution.be>2014-10-05 20:06:51 +0200
committerTim Graham <timograham@gmail.com>2014-10-06 09:08:45 -0400
commitf58392d8d8b68e2e7777768f39941cd995ce16e4 (patch)
tree5ffe8def9205e5a594fcfa4fe95714b1e25c74a7 /tests/regressiontests/admin_views/admin.py
parentdf657a768248c07fdbdc950b08366f655d0f2f5d (diff)
[1.4.x] Fixed #23604 -- Allowed related m2m fields to be references in the admin.
Thanks Simon Charette for review. Backport of a24cf21722 from master
Diffstat (limited to 'tests/regressiontests/admin_views/admin.py')
-rw-r--r--tests/regressiontests/admin_views/admin.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/regressiontests/admin_views/admin.py b/tests/regressiontests/admin_views/admin.py
index f1147f6c47..d6c26ac535 100644
--- a/tests/regressiontests/admin_views/admin.py
+++ b/tests/regressiontests/admin_views/admin.py
@@ -28,7 +28,7 @@ from .models import (Article, Chapter, Account, Media, Child, Parent, Picture,
AdminOrderedField, AdminOrderedModelMethod, AdminOrderedAdminMethod,
AdminOrderedCallable, Report, Color2, UnorderedObject, MainPrepopulated,
RelatedPrepopulated, ReferencedByParent, ChildOfReferer, M2MReference,
- ReferencedByInline, InlineReference, InlineReferer)
+ ReferencedByInline, InlineReference, InlineReferer, Ingredient)
def callable_year(dt_value):
@@ -656,6 +656,7 @@ site.register(AdminOrderedModelMethod, AdminOrderedModelMethodAdmin)
site.register(AdminOrderedAdminMethod, AdminOrderedAdminMethodAdmin)
site.register(AdminOrderedCallable, AdminOrderedCallableAdmin)
site.register(Color2, CustomTemplateFilterColorAdmin)
+site.register(Ingredient)
# Register core models we need in our tests
from django.contrib.auth.models import User, Group