Navigation

Changeset 8800

Timestamp:

09/01/08 12:23:09 (3 months ago)

Author:

jacob

Message:

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.

Files:

r8616	r8800
9	9	from django.contrib.contenttypes.models import ContentType
10	10	from models import Comment
	11	from django.utils.encoding import force_unicode
11	12	from django.utils.text import get_text_list
12	13	from django.utils.translation import ngettext
…	…
50	51	new = Comment(
51	52	content_type = ContentType.objects.get_for_model(self.target_object),
52		object_pk = ~~str~~(self.target_object._get_pk_val()),
	53	object_pk = force_unicode(self.target_object._get_pk_val()),
53	54	user_name = self.cleaned_data["name"],
54	55	user_email = self.cleaned_data["email"],

r8557	r8800
2	2	from django.dispatch import dispatcher
3	3	from django.contrib.contenttypes.models import ContentType
	4	from django.utils.encoding import force_unicode
4	5
5	6	class CommentManager(models.Manager):
…	…
19	20	qs = self.get_query_set().filter(content_type=ct)
20	21	if isinstance(model, models.Model):
21		qs = qs.filter(object_pk=~~model._get_pk_val(~~))
	22	qs = qs.filter(object_pk=force_unicode(model._get_pk_val()))
22	23	return qs