diff options
| author | Joseph Kocherhans <joseph@jkocherhans.com> | 2007-09-15 20:23:38 +0000 |
|---|---|---|
| committer | Joseph Kocherhans <joseph@jkocherhans.com> | 2007-09-15 20:23:38 +0000 |
| commit | e51a819595cbb5f2b142a995d766820c1e1fa661 (patch) | |
| tree | fdf62aabdf9e9447d3777a543d0605a17472ac3c | |
| parent | a922c20902f3ecf52fcb9f1b10bc89613d6d3a77 (diff) | |
newforms-admin: Fixed #4963. We now use force_unicode instead of str for creating django.contrib.admin.LogEntry objects.
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6327 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/options.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index cd0da2b895..901847220f 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -366,7 +366,7 @@ class ModelAdmin(BaseModelAdmin): formset.save() pk_value = new_object._get_pk_val() - LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(model).id, pk_value, str(new_object), ADDITION) + LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(model).id, pk_value, force_unicode(new_object), ADDITION) msg = _('The %(name)s "%(obj)s" was added successfully.') % {'name': opts.verbose_name, 'obj': new_object} # Here, we distinguish between different save types by checking for # the presence of keys in request.POST. @@ -425,7 +425,7 @@ class ModelAdmin(BaseModelAdmin): #change_message = ' '.join(change_message) if not change_message: change_message = _('No fields changed.') - LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(model).id, pk_value, str(new_object), CHANGE, change_message) + LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(model).id, pk_value, force_unicode(new_object), CHANGE, change_message) msg = _('The %(name)s "%(obj)s" was changed successfully.') % {'name': opts.verbose_name, 'obj': new_object} if request.POST.has_key("_continue"): |