Merge 7c5c17f into 26b6171

kuma/wiki/feeds.py

@@ -55,7 +55,7 @@ def item_description(self, document):
         return document.current_revision.summary
 
     def item_author_name(self, document):
-        return '%s' % document.current_revision.creator
+        return document.current_revision.creator.username
 
     def item_author_link(self, document):
         return self.request.build_absolute_uri(
@@ -281,8 +281,13 @@ def items(self):
         if self.request.GET.get('all_locales', False) is False:
             items = items.filter(document__locale=self.request.locale)
 
-        items = items.prefetch_related('creator', 'document')
-        return items.order_by('-created')[start:finish]
+        # Temporarily storing the selected revision PKs in a list
+        # to speed up retrieval (max MAX_FEED_ITEMS size)
+        item_pks = items.values_list('pk', flat=True)[start:finish]
+        return (Revision.objects.filter(pk__in=list(item_pks))
+                                .prefetch_related('creator',
+                                                  'document')
+                                .order_by('-created'))
 
     def item_title(self, item):
         return '%s (%s)' % (item.document.full_path, item.document.locale)
@@ -371,7 +376,7 @@ def item_pubdate(self, item):
         return item.created
 
     def item_author_name(self, item):
-        return u'%s' % item.creator
+        return item.creator.username
 
     def item_author_link(self, item):
         return self.request.build_absolute_uri(item.creator.get_absolute_url())

kuma/wiki/models.py

@@ -1834,11 +1834,8 @@ def get_previous(self):
         Returns the previous approved revision or None.
         """
         try:
-            return self.document.revisions.filter(
-                is_approved=True,
-                created__lt=self.created,
-            ).order_by('-created')[0]
-        except IndexError:
+            return self.get_previous_by_created(is_approved=True)
+        except Revision.DoesNotExist:
             return None
 
     @cached_property