mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 10:19:20 +00:00
Code Issues 32 Releases Wiki Activity

[soc2009/multidb] Added partial handling for comments to be multi-db compliant. Patch from Russell Keith-Magee.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor 2009-12-17 16:12:51 +00:00
parent 44f21f2374
commit 562c5ffb07
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
django/contrib/comments/forms.py
View File

@ -28,7 +28,7 @@ class CommentSecurityForm(forms.Form):
initial = {} initial = {}
initial.update(self.generate_security_data()) initial.update(self.generate_security_data())
super(CommentSecurityForm, self).__init__(data=data, initial=initial) super(CommentSecurityForm, self).__init__(data=data, initial=initial)
def security_errors(self): def security_errors(self):
"""Return just those errors associated with security""" """Return just those errors associated with security"""
errors = ErrorDict() errors = ErrorDict()
@ -107,13 +107,13 @@ class CommentDetailsForm(CommentSecurityForm):
""" """
if not self.is_valid(): if not self.is_valid():
raise ValueError("get_comment_object may only be called on valid forms") raise ValueError("get_comment_object may only be called on valid forms")
CommentModel = self.get_comment_model() CommentModel = self.get_comment_model()
new = CommentModel(**self.get_comment_create_data()) new = CommentModel(**self.get_comment_create_data())
new = self.check_for_duplicate_comment(new) new = self.check_for_duplicate_comment(new)
return new return new
def get_comment_model(self): def get_comment_model(self):
""" """
Get the comment model to create with this form. Subclasses in custom Get the comment model to create with this form. Subclasses in custom
@ -121,7 +121,7 @@ class CommentDetailsForm(CommentSecurityForm):
check_for_duplicate_comment to provide custom comment models. check_for_duplicate_comment to provide custom comment models.
""" """
return Comment return Comment
def get_comment_create_data(self): def get_comment_create_data(self):
""" """
Returns the dict of data to be used to create a comment. Subclasses in Returns the dict of data to be used to create a comment. Subclasses in
@ -140,13 +140,15 @@ class CommentDetailsForm(CommentSecurityForm):
is_public = True, is_public = True,
is_removed = False, is_removed = False,
) )
def check_for_duplicate_comment(self, new): def check_for_duplicate_comment(self, new):
""" """
Check that a submitted comment isn't a duplicate. This might be caused Check that a submitted comment isn't a duplicate. This might be caused
by someone posting a comment twice. If it is a dup, silently return the *previous* comment. by someone posting a comment twice. If it is a dup, silently return the *previous* comment.
""" """
possible_duplicates = self.get_comment_model()._default_manager.filter( possible_duplicates = self.get_comment_model()._default_manager.using(
self.target_object._state.db
).filter(
content_type = new.content_type, content_type = new.content_type,
object_pk = new.object_pk, object_pk = new.object_pk,
user_name = new.user_name, user_name = new.user_name,
@ -156,7 +158,7 @@ class CommentDetailsForm(CommentSecurityForm):
for old in possible_duplicates: for old in possible_duplicates:
if old.submit_date.date() == new.submit_date.date() and old.comment == new.comment: if old.submit_date.date() == new.submit_date.date() and old.comment == new.comment:
return old return old
return new return new
def clean_comment(self): def clean_comment(self):