Author: jacob
Date: 2008-09-01 12:23:09 -0500 (Mon, 01 Sep 2008)
New Revision: 8800
Modified:
django/trunk/django/contrib/comments/forms.py
django/trunk/django/contrib/comments/managers.py
Log:
Make sure to use force_unicode when looking up comment objects by `object_pk`.
Fixes #8762, and one other bug that nobody's reported yet.
Modified: django/trunk/django/contrib/comments/forms.py
===================================================================
--- django/trunk/django/contrib/comments/forms.py 2008-09-01 17:22:34 UTC
(rev 8799)
+++ django/trunk/django/contrib/comments/forms.py 2008-09-01 17:23:09 UTC
(rev 8800)
@@ -8,6 +8,7 @@
from django.http import Http404
from django.contrib.contenttypes.models import ContentType
from models import Comment
+from django.utils.encoding import force_unicode
from django.utils.text import get_text_list
from django.utils.translation import ngettext
from django.utils.translation import ugettext_lazy as _
@@ -49,7 +50,7 @@
new = Comment(
content_type =
ContentType.objects.get_for_model(self.target_object),
- object_pk = str(self.target_object._get_pk_val()),
+ object_pk = force_unicode(self.target_object._get_pk_val()),
user_name = self.cleaned_data["name"],
user_email = self.cleaned_data["email"],
user_url = self.cleaned_data["url"],
Modified: django/trunk/django/contrib/comments/managers.py
===================================================================
--- django/trunk/django/contrib/comments/managers.py 2008-09-01 17:22:34 UTC
(rev 8799)
+++ django/trunk/django/contrib/comments/managers.py 2008-09-01 17:23:09 UTC
(rev 8800)
@@ -1,6 +1,7 @@
from django.db import models
from django.dispatch import dispatcher
from django.contrib.contenttypes.models import ContentType
+from django.utils.encoding import force_unicode
class CommentManager(models.Manager):
@@ -18,5 +19,5 @@
ct = ContentType.objects.get_for_model(model)
qs = self.get_query_set().filter(content_type=ct)
if isinstance(model, models.Model):
- qs = qs.filter(object_pk=model._get_pk_val())
+ qs = qs.filter(object_pk=force_unicode(model._get_pk_val()))
return qs
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
