Ticket #14234: dj14234-save-base_tests.diff

django/db/models/base.py

@@ -558 +558 @@
         if origin and not meta.auto_created:
             signals.post_save.send(sender=origin, instance=self,
                 created=(not record_exists), raw=raw, using=using)
-
+        self._adding = False
     save_base.alters_data = True
 
     def _collect_sub_objects(self, seen_objs, parent=None, nullable=False):

tests/regressiontests/forms/models.py

@@ -72 +72 @@
     def __unicode__(self):
         return u'%s' % self.name
 
+class Ticket14234(models.Model):
+   name = models.CharField(max_length=100)
+   age = models.IntegerField()
+   description = models.TextField(blank=True)
+
+   def __unicode__(self):
+       return self.name
+
+   def save(self, *args, **kwargs):
+       self.full_clean()
+       return super(Ticket14234, self).save(*args, **kwargs)
+
+class Ticket14234Form(django_forms.ModelForm):
+   class Meta:
+       model = Ticket14234
+
+class TestTicket14234(TestCase):
+    ''' ModelForm.instance._adding should be set to False after ModelForm.save is executed (test for #14234)'''
+    def test_things(self):
+        form = Ticket14234Form({
+            'name': 'Fred',
+            'age': '56',
+            'description': 'Old Fred is 56',
+        })
+        if form.is_valid():
+            self.assertEqual(form.instance._adding, True)
+            obj = form.save()
+            self.assertEqual(obj._adding, False)
+            obj.age = 27
+            obj.save()  # Without the patch we cannot resave
+
 class TestTicket12510(TestCase):
     ''' It is not necessary to generate choices for ModelChoiceField (regression test for #12510). '''
     def setUp(self):