Author: mtredinnick
Date: 2008-08-28 14:28:17 -0500 (Thu, 28 Aug 2008)
New Revision: 8673
Modified:
django/trunk/django/contrib/comments/models.py
django/trunk/django/contrib/sites/models.py
django/trunk/tests/modeltests/save_delete_hooks/models.py
django/trunk/tests/regressiontests/bug639/models.py
django/trunk/tests/regressiontests/extra_regress/models.py
Log:
Updated a few save() methods on models to accept force_insert and force_update
parameters. Required as a consequence of [8670] (so they can be used with
create()).
Modified: django/trunk/django/contrib/comments/models.py
===================================================================
--- django/trunk/django/contrib/comments/models.py 2008-08-28 19:05:14 UTC
(rev 8672)
+++ django/trunk/django/contrib/comments/models.py 2008-08-28 19:28:17 UTC
(rev 8673)
@@ -74,10 +74,10 @@
def __unicode__(self):
return "%s: %s..." % (self.name, self.comment[:50])
- def save(self):
+ def save(self, force_insert=False, force_update=False):
if self.submit_date is None:
self.submit_date = datetime.datetime.now()
- super(Comment, self).save()
+ super(Comment, self).save(force_insert, force_update)
def _get_userinfo(self):
"""
@@ -178,7 +178,7 @@
return "%s flag of comment ID %s by %s" % \
(self.flag, self.comment_id, self.user.username)
- def save(self):
+ def save(self, force_insert=False, force_update=False):
if self.flag_date is None:
self.flag_date = datetime.datetime.now()
- super(CommentFlag, self).save()
+ super(CommentFlag, self).save(force_insert, force_update)
Modified: django/trunk/django/contrib/sites/models.py
===================================================================
--- django/trunk/django/contrib/sites/models.py 2008-08-28 19:05:14 UTC (rev
8672)
+++ django/trunk/django/contrib/sites/models.py 2008-08-28 19:28:17 UTC (rev
8673)
@@ -64,7 +64,7 @@
def __unicode__(self):
return self.domain
- def save(self):
+ def save(self, force_insert=False, force_update=False):
raise NotImplementedError('RequestSite cannot be saved.')
def delete(self):
Modified: django/trunk/tests/modeltests/save_delete_hooks/models.py
===================================================================
--- django/trunk/tests/modeltests/save_delete_hooks/models.py 2008-08-28
19:05:14 UTC (rev 8672)
+++ django/trunk/tests/modeltests/save_delete_hooks/models.py 2008-08-28
19:28:17 UTC (rev 8673)
@@ -14,9 +14,10 @@
def __unicode__(self):
return u"%s %s" % (self.first_name, self.last_name)
- def save(self):
+ def save(self, force_insert=False, force_update=False):
print "Before save"
- super(Person, self).save() # Call the "real" save() method
+ # Call the "real" save() method
+ super(Person, self).save(force_insert, force_update)
print "After save"
def delete(self):
Modified: django/trunk/tests/regressiontests/bug639/models.py
===================================================================
--- django/trunk/tests/regressiontests/bug639/models.py 2008-08-28 19:05:14 UTC
(rev 8672)
+++ django/trunk/tests/regressiontests/bug639/models.py 2008-08-28 19:28:17 UTC
(rev 8673)
@@ -16,8 +16,8 @@
super(Photo, self).__init__(*args, **kwargs)
self._savecount = 0
- def save(self):
- super(Photo, self).save()
+ def save(self, force_insert=False, force_update=False):
+ super(Photo, self).save(force_insert, force_update)
self._savecount += 1
class PhotoForm(ModelForm):
Modified: django/trunk/tests/regressiontests/extra_regress/models.py
===================================================================
--- django/trunk/tests/regressiontests/extra_regress/models.py 2008-08-28
19:05:14 UTC (rev 8672)
+++ django/trunk/tests/regressiontests/extra_regress/models.py 2008-08-28
19:28:17 UTC (rev 8673)
@@ -13,8 +13,8 @@
def __unicode__(self):
return u"%s (%s, %s)" % (self.title, self.id, self.base.id)
- def save(self):
- super(RevisionableModel, self).save()
+ def save(self, force_insert=False, force_update=False):
+ super(RevisionableModel, self).save(force_insert, force_update)
if not self.base:
self.base = self
super(RevisionableModel, self).save()
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
