Ralfp 12 лет назад
Родитель
Сommit
0305683a24
2 измененных файлов с 6 добавлено и 6 удалено
  1. 3 3
      misago/apps/profiles/posts/views.py
  2. 3 3
      misago/apps/profiles/threads/views.py

+ 3 - 3
misago/apps/profiles/posts/views.py

@@ -12,7 +12,7 @@ from misago.utils.pagination import make_pagination
 
 @profile_view('user_posts')
 def posts(request, user, page=0):
-    queryset = user.post_set.filter(forum_id__in=Forum.objects.readable_forums(request.acl)).filter(deleted=False).filter(moderated=False).select_related('thread', 'forum').order_by('-id')
+    queryset = user.post_set.filter(forum_id__in=Forum.objects.readable_forums(request.acl)).filter(deleted=False).filter(moderated=False)
     count = queryset.count()
     try:
         pagination = make_pagination(page, count, 12)
@@ -23,7 +23,7 @@ def posts(request, user, page=0):
     graph = cache.get(cache_key, 'nada')
     if graph == 'nada':
         if user.posts:
-            graph = user.timeline(user.post_set.filter(date__gte=timezone.now()-timedelta(days=100)))
+            graph = user.timeline(queryset.filter(date__gte=timezone.now()-timedelta(days=100)))
         else:
             graph = [0 for x in range(100)]
         cache.set(cache_key, graph, 14400)
@@ -35,6 +35,6 @@ def posts(request, user, page=0):
                                   'graph_max': max(graph),
                                   'graph': (str(i) for i in graph),
                                   'items_total': count,
-                                  'items': queryset[pagination['start']:pagination['stop']],
+                                  'items': queryset.select_related('thread', 'forum').order_by('-id')[pagination['start']:pagination['stop']],
                                   'pagination': pagination,
                                   }));

+ 3 - 3
misago/apps/profiles/threads/views.py

@@ -12,7 +12,7 @@ from misago.utils.pagination import make_pagination
 
 @profile_view('user_threads')
 def threads(request, user, page=0):
-    queryset = user.thread_set.filter(forum_id__in=Forum.objects.readable_forums(request.acl)).filter(deleted=False).filter(moderated=False).select_related('start_post', 'forum').order_by('-id')
+    queryset = user.thread_set.filter(forum_id__in=Forum.objects.readable_forums(request.acl)).filter(deleted=False).filter(moderated=False)
     count = queryset.count()
     try:
         pagination = make_pagination(page, count, 12)
@@ -23,7 +23,7 @@ def threads(request, user, page=0):
     graph = cache.get(cache_key, 'nada')
     if graph == 'nada':
         if user.posts:
-            graph = user.timeline(user.thread_set.filter(start__gte=timezone.now()-timedelta(days=100)))
+            graph = user.timeline(queryset.filter(start__gte=timezone.now()-timedelta(days=100)))
         else:
             graph = [0 for x in range(100)]
         cache.set(cache_key, graph, 14400)
@@ -35,6 +35,6 @@ def threads(request, user, page=0):
                                   'graph_max': max(graph),
                                   'graph': (str(i) for i in graph),
                                   'items_total': count,
-                                  'items': queryset[pagination['start']:pagination['stop']],
+                                  'items': queryset.select_related('start_post', 'forum').order_by('-id')[pagination['start']:pagination['stop']],
                                   'pagination': pagination,
                                   }));