Fixed #17642 -- Added min_num support to modelformsets, inlines, and the admin.

Thanks Stephen Burrows for work on the patch as well.

Forwardport of 2914f66983 from stable/1.7.x
This commit is contained in:
Anders Steinlein 2014-03-05 21:19:40 +01:00 committed by Tim Graham
parent 860d31ac7a
commit 4ef10f245a
15 changed files with 229 additions and 61 deletions

View file

@ -1,8 +1,8 @@
from django.contrib import admin
from django.contrib.contenttypes.admin import GenericTabularInline
from .models import (Media, PhoneNumber, Episode, EpisodeExtra, Contact,
Category, EpisodePermanent, EpisodeMaxNum)
from .models import (Media, PhoneNumber, Episode, Contact,
Category, EpisodePermanent)
site = admin.AdminSite(name="admin")
@ -18,17 +18,6 @@ class EpisodeAdmin(admin.ModelAdmin):
]
class MediaExtraInline(GenericTabularInline):
model = Media
extra = 0
class MediaMaxNumInline(GenericTabularInline):
model = Media
extra = 5
max_num = 2
class PhoneNumberInline(GenericTabularInline):
model = PhoneNumber
@ -39,8 +28,6 @@ class MediaPermanentInline(GenericTabularInline):
site.register(Episode, EpisodeAdmin)
site.register(EpisodeExtra, inlines=[MediaExtraInline])
site.register(EpisodeMaxNum, inlines=[MediaMaxNumInline])
site.register(Contact, inlines=[PhoneNumberInline])
site.register(Category)
site.register(EpisodePermanent, inlines=[MediaPermanentInline])