mirror of
https://github.com/django/django.git
synced 2025-08-03 02:23:12 +00:00
Fixed #10922 -- Corrected handling of POST data to ensure that the right objects are updated on save when the ordering field is editable. Thanks to Alex Gaynor, Karen Tracy, and Will Hardy for their contributions to this patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee
parent
88da053e5e
commit
7ecb8b08b3
3 changed files with 151 additions and 14 deletions
|
|
@ -326,7 +326,6 @@ 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)
|
||||
|
|
@ -401,8 +400,25 @@ class WhatsitInline(admin.StackedInline):
|
|||
class FancyDoodadInline(admin.StackedInline):
|
||||
model = FancyDoodad
|
||||
|
||||
class Category(models.Model):
|
||||
collector = models.ForeignKey(Collector)
|
||||
order = models.PositiveIntegerField()
|
||||
|
||||
class Meta:
|
||||
ordering = ('order',)
|
||||
|
||||
def __unicode__(self):
|
||||
return u'%s:o%s' % (self.id, self.order)
|
||||
|
||||
class CategoryAdmin(admin.ModelAdmin):
|
||||
list_display = ('id', 'collector', 'order')
|
||||
list_editable = ('order',)
|
||||
|
||||
class CategoryInline(admin.StackedInline):
|
||||
model = Category
|
||||
|
||||
class CollectorAdmin(admin.ModelAdmin):
|
||||
inlines = [WidgetInline, DooHickeyInline, GrommetInline, WhatsitInline, FancyDoodadInline]
|
||||
inlines = [WidgetInline, DooHickeyInline, GrommetInline, WhatsitInline, FancyDoodadInline, CategoryInline]
|
||||
|
||||
admin.site.register(Article, ArticleAdmin)
|
||||
admin.site.register(CustomArticle, CustomArticleAdmin)
|
||||
|
|
@ -426,6 +442,7 @@ admin.site.register(Language, LanguageAdmin)
|
|||
admin.site.register(Recommendation, RecommendationAdmin)
|
||||
admin.site.register(Recommender)
|
||||
admin.site.register(Collector, CollectorAdmin)
|
||||
admin.site.register(Category, CategoryAdmin)
|
||||
|
||||
# We intentionally register Promo and ChapterXtra1 but not Chapter nor ChapterXtra2.
|
||||
# That way we cover all four cases:
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@ from django.utils.html import escape
|
|||
from models import Article, BarAccount, CustomArticle, EmptyModel, \
|
||||
ExternalSubscriber, FooAccount, Gallery, ModelWithStringPrimaryKey, \
|
||||
Person, Persona, Picture, Podcast, Section, Subscriber, Vodcast, \
|
||||
Language, Collector, Widget, Grommet, DooHickey, FancyDoodad, Whatsit
|
||||
Language, Collector, Widget, Grommet, DooHickey, FancyDoodad, Whatsit, \
|
||||
Category
|
||||
|
||||
try:
|
||||
set
|
||||
|
|
@ -921,6 +922,45 @@ class AdminViewListEditable(TestCase):
|
|||
|
||||
self.failUnlessEqual(Person.objects.get(name="John Mauchly").alive, False)
|
||||
|
||||
def test_list_editable_ordering(self):
|
||||
collector = Collector.objects.create(id=1, name="Frederick Clegg")
|
||||
|
||||
Category.objects.create(id=1, order=1, collector=collector)
|
||||
Category.objects.create(id=2, order=2, collector=collector)
|
||||
Category.objects.create(id=3, order=0, collector=collector)
|
||||
Category.objects.create(id=4, order=0, collector=collector)
|
||||
|
||||
# NB: The order values must be changed so that the items are reordered.
|
||||
data = {
|
||||
"form-TOTAL_FORMS": "4",
|
||||
"form-INITIAL_FORMS": "4",
|
||||
|
||||
"form-0-order": "14",
|
||||
"form-0-id": "1",
|
||||
"form-0-collector": "1",
|
||||
|
||||
"form-1-order": "13",
|
||||
"form-1-id": "2",
|
||||
"form-1-collector": "1",
|
||||
|
||||
"form-2-order": "1",
|
||||
"form-2-id": "3",
|
||||
"form-2-collector": "1",
|
||||
|
||||
"form-3-order": "0",
|
||||
"form-3-id": "4",
|
||||
"form-3-collector": "1",
|
||||
}
|
||||
response = self.client.post('/test_admin/admin/admin_views/category/', data)
|
||||
# Successful post will redirect
|
||||
self.failUnlessEqual(response.status_code, 302)
|
||||
|
||||
# Check that the order values have been applied to the right objects
|
||||
self.failUnlessEqual(Category.objects.get(id=1).order, 14)
|
||||
self.failUnlessEqual(Category.objects.get(id=2).order, 13)
|
||||
self.failUnlessEqual(Category.objects.get(id=3).order, 1)
|
||||
self.failUnlessEqual(Category.objects.get(id=4).order, 0)
|
||||
|
||||
class AdminSearchTest(TestCase):
|
||||
fixtures = ['admin-views-users','multiple-child-classes']
|
||||
|
||||
|
|
@ -1254,11 +1294,24 @@ class AdminInlineTests(TestCase):
|
|||
"fancydoodad_set-2-owner": "1",
|
||||
"fancydoodad_set-2-name": "",
|
||||
"fancydoodad_set-2-expensive": "on",
|
||||
|
||||
"category_set-TOTAL_FORMS": "3",
|
||||
"category_set-INITIAL_FORMS": "0",
|
||||
"category_set-0-order": "",
|
||||
"category_set-0-id": "",
|
||||
"category_set-0-collector": "1",
|
||||
"category_set-1-order": "",
|
||||
"category_set-1-id": "",
|
||||
"category_set-1-collector": "1",
|
||||
"category_set-2-order": "",
|
||||
"category_set-2-id": "",
|
||||
"category_set-2-collector": "1",
|
||||
}
|
||||
|
||||
result = self.client.login(username='super', password='secret')
|
||||
self.failUnlessEqual(result, True)
|
||||
Collector(pk=1,name='John Fowles').save()
|
||||
self.collector = Collector(pk=1,name='John Fowles')
|
||||
self.collector.save()
|
||||
|
||||
def tearDown(self):
|
||||
self.client.logout()
|
||||
|
|
@ -1419,3 +1472,58 @@ class AdminInlineTests(TestCase):
|
|||
self.failUnlessEqual(response.status_code, 302)
|
||||
self.failUnlessEqual(FancyDoodad.objects.count(), 1)
|
||||
self.failUnlessEqual(FancyDoodad.objects.all()[0].name, "Fancy Doodad 1 Updated")
|
||||
|
||||
def test_ordered_inline(self):
|
||||
"""Check that an inline with an editable ordering fields is
|
||||
updated correctly. Regression for #10922"""
|
||||
# Create some objects with an initial ordering
|
||||
Category.objects.create(id=1, order=1, collector=self.collector)
|
||||
Category.objects.create(id=2, order=2, collector=self.collector)
|
||||
Category.objects.create(id=3, order=0, collector=self.collector)
|
||||
Category.objects.create(id=4, order=0, collector=self.collector)
|
||||
|
||||
# NB: The order values must be changed so that the items are reordered.
|
||||
self.post_data.update({
|
||||
"name": "Frederick Clegg",
|
||||
|
||||
"category_set-TOTAL_FORMS": "7",
|
||||
"category_set-INITIAL_FORMS": "4",
|
||||
|
||||
"category_set-0-order": "14",
|
||||
"category_set-0-id": "1",
|
||||
"category_set-0-collector": "1",
|
||||
|
||||
"category_set-1-order": "13",
|
||||
"category_set-1-id": "2",
|
||||
"category_set-1-collector": "1",
|
||||
|
||||
"category_set-2-order": "1",
|
||||
"category_set-2-id": "3",
|
||||
"category_set-2-collector": "1",
|
||||
|
||||
"category_set-3-order": "0",
|
||||
"category_set-3-id": "4",
|
||||
"category_set-3-collector": "1",
|
||||
|
||||
"category_set-4-order": "",
|
||||
"category_set-4-id": "",
|
||||
"category_set-4-collector": "1",
|
||||
|
||||
"category_set-5-order": "",
|
||||
"category_set-5-id": "",
|
||||
"category_set-5-collector": "1",
|
||||
|
||||
"category_set-6-order": "",
|
||||
"category_set-6-id": "",
|
||||
"category_set-6-collector": "1",
|
||||
})
|
||||
response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
|
||||
# Successful post will redirect
|
||||
self.failUnlessEqual(response.status_code, 302)
|
||||
|
||||
# Check that the order values have been applied to the right objects
|
||||
self.failUnlessEqual(self.collector.category_set.count(), 4)
|
||||
self.failUnlessEqual(Category.objects.get(id=1).order, 14)
|
||||
self.failUnlessEqual(Category.objects.get(id=2).order, 13)
|
||||
self.failUnlessEqual(Category.objects.get(id=3).order, 1)
|
||||
self.failUnlessEqual(Category.objects.get(id=4).order, 0)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue