changeset 552:9e42e6618168

For bitbucket issue #2, tweak the admin settings for the Post model to reduce slow queries. Define our own queryset() method so we can control the select_related(), and not have it cascade from post to topics to forums to categories. Removed 'topic' from list_display because MySQL still sucked with 2 inner joins. Now it seems to be tolerable with only one join to User.
author Brian Neal <bgneal@gmail.com>
date Wed, 25 Jan 2012 20:07:03 -0600
parents f37ef598fecc
children abc4be5a82e5
files gpp/forums/admin.py gpp/forums/models.py
diffstat 2 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gpp/forums/admin.py	Tue Jan 17 18:30:41 2012 -0600
+++ b/gpp/forums/admin.py	Wed Jan 25 20:07:03 2012 -0600
@@ -40,7 +40,7 @@
 
 
 class PostAdmin(admin.ModelAdmin):
-    list_display = ('topic', 'user', 'creation_date', 'update_date', 'summary')
+    list_display = ('user', 'creation_date', 'update_date', 'user_ip', 'summary')
     raw_id_fields = ('topic', 'user', )
     exclude = ('html', )
     search_fields = ('body', )
@@ -49,6 +49,9 @@
     ordering = ('-creation_date', )
     save_on_top = True
 
+    def queryset(self, request):
+        return Post.objects.select_related('user')
+
 
 class FlaggedPostAdmin(admin.ModelAdmin):
     list_display = ['__unicode__', 'flag_date', 'get_post_url']
--- a/gpp/forums/models.py	Tue Jan 17 18:30:41 2012 -0600
+++ b/gpp/forums/models.py	Wed Jan 25 20:07:03 2012 -0600
@@ -281,10 +281,10 @@
         return ('forums-goto_post', [self.pk])
 
     def summary(self):
-        LIMIT = 50
-        if len(self.body) < LIMIT:
+        limit = 65
+        if len(self.body) < limit:
             return self.body
-        return self.body[:LIMIT] + '...'
+        return self.body[:limit] + '...'
 
     def __unicode__(self):
         return self.summary()