Never return a proxy object from __unicode__ ! (#73)

wiki/admin.py

@@ -19,12 +19,14 @@ class ArticleRevisionForm(forms.ModelForm):
         
     def __init__(self, *args, **kwargs):
         super(ArticleRevisionForm, self).__init__(*args, **kwargs)
+        # TODO: This pattern is too weird
         EditorClass = editors.getEditorClass()
         editor = editors.getEditor()
         self.fields['content'].widget = editor.get_admin_widget()
 
 class ArticleRevisionAdmin(admin.ModelAdmin):
     form = ArticleRevisionForm
+    display_list = ('title', 'created', 'modified', 'user', 'ip_address')
     class Media:
         js = editors.getEditorClass().AdminMedia.js
         css = editors.getEditorClass().AdminMedia.css

wiki/models/article.py

@@ -165,7 +165,8 @@ class Article(models.Model):
     def __unicode__(self):
         if self.current_revision:
             return self.current_revision.title
-        return _(u'Article without content (%(id)d)') % {'id': self.id}
+        obj_name = _(u'Article without content (%(id)d)') % {'id': self.id}
+        return unicode(obj_name)
     
     class Meta:
         app_label = settings.APP_LABEL

wiki/plugins/images/models.py

@@ -43,7 +43,7 @@ class Image(RevisionPlugin):
     
     def __unicode__(self):
         title = (_(u'Image: %s') % self.current_revision.imagerevision.get_filename()) if self.current_revision else _(u'Current revision not set!!')
-        return title
+        return unicode(title)
 
 class ImageRevision(RevisionPluginRevision):
     
@@ -95,4 +95,5 @@ class ImageRevision(RevisionPluginRevision):
         ordering = ('-created',)
 
     def __unicode__(self):
-        return _(u'Image Revsion: %d') % self.revision_number
+        title = _(u'Image Revsion: %d') % self.revision_number
+        return unicode(title)

wiki/plugins/notifications/models.py

@@ -15,10 +15,11 @@ from wiki.plugins.notifications.util import get_title
 class ArticleSubscription(ArticlePlugin, Subscription):
     
     def __unicode__(self):
-        return (_(u"%(user)s subscribing to %(article)s (%(type)s)") % 
-                {'user': self.settings.user.username,
-                 'article': self.article.current_revision.title,
-                 'type': self.notification_type.label})
+        title = (_(u"%(user)s subscribing to %(article)s (%(type)s)") % 
+                 {'user': self.settings.user.username,
+                  'article': self.article.current_revision.title,
+                  'type': self.notification_type.label})
+        return unicode(title)
     
     class Meta:
         app_label = settings.APP_LABEL