mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #19774 -- Deprecated the contenttypes.generic module.

Browse Source 
It contained models, forms and admin objects causing undesirable
import side effects. Refs #16368.

Thanks to Ramiro, Carl and Loïc for the review.
This commit is contained in:
Simon Charette
2014-01-22 01:43:33 -05:00
parent c3881944e8
commit 10e3faf191
33 changed files with 1011 additions and 906 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/generic_inline_admin/admin.py
View File

@@ -1,5 +1,5 @@
from django.contrib import admin
from django.contrib.contenttypes import generic
from django.contrib.contenttypes.admin import GenericTabularInline
from .models import (Media, PhoneNumber, Episode, EpisodeExtra, Contact,
Category, EpisodePermanent, EpisodeMaxNum)
@@ -8,7 +8,7 @@ from .models import (Media, PhoneNumber, Episode, EpisodeExtra, Contact,
site = admin.AdminSite(name="admin")
class MediaInline(generic.GenericTabularInline):
class MediaInline(GenericTabularInline):
model = Media
@@ -18,22 +18,22 @@ class EpisodeAdmin(admin.ModelAdmin):
]
class MediaExtraInline(generic.GenericTabularInline):
class MediaExtraInline(GenericTabularInline):
model = Media
extra = 0
class MediaMaxNumInline(generic.GenericTabularInline):
class MediaMaxNumInline(GenericTabularInline):
model = Media
extra = 5
max_num = 2
class PhoneNumberInline(generic.GenericTabularInline):
class PhoneNumberInline(GenericTabularInline):
model = PhoneNumber
class MediaPermanentInline(generic.GenericTabularInline):
class MediaPermanentInline(GenericTabularInline):
model = Media
can_delete = False