mirror of
https://github.com/django/django.git
synced 2025-10-24 06:06:09 +00:00
Fixed #10893 -- Corrected a problem with using list_editable in the admin when the model has a manual primary key. Thanks to Alex Gaynor for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10681 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
@@ -325,6 +325,20 @@ class GalleryAdmin(admin.ModelAdmin):
|
||||
class PictureAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
|
||||
|
||||
class Language(models.Model):
|
||||
iso = models.CharField(max_length=5, primary_key=True)
|
||||
name = models.CharField(max_length=50)
|
||||
english_name = models.CharField(max_length=50)
|
||||
shortlist = models.BooleanField(default=False)
|
||||
|
||||
class Meta:
|
||||
ordering = ('iso',)
|
||||
|
||||
class LanguageAdmin(admin.ModelAdmin):
|
||||
list_display = ['iso', 'shortlist', 'english_name', 'name']
|
||||
list_editable = ['shortlist']
|
||||
|
||||
admin.site.register(Article, ArticleAdmin)
|
||||
admin.site.register(CustomArticle, CustomArticleAdmin)
|
||||
admin.site.register(Section, save_as=True, inlines=[ArticleInline])
|
||||
@@ -343,6 +357,7 @@ admin.site.register(EmptyModel, EmptyModelAdmin)
|
||||
admin.site.register(Fabric, FabricAdmin)
|
||||
admin.site.register(Gallery, GalleryAdmin)
|
||||
admin.site.register(Picture, PictureAdmin)
|
||||
admin.site.register(Language, LanguageAdmin)
|
||||
|
||||
# We intentionally register Promo and ChapterXtra1 but not Chapter nor ChapterXtra2.
|
||||
# That way we cover all four cases:
|
||||
|
||||
Reference in New Issue
Block a user