diff options
| author | Aurélien Bompard <aurelien@bompard.org> | 2013-11-30 19:11:02 +0100 |
|---|---|---|
| committer | Aurélien Bompard <aurelien@bompard.org> | 2013-12-01 13:55:06 +0100 |
| commit | 85b8ca13fc2e164971f7cbb06c4a0c5b0a1a0770 (patch) | |
| tree | 179beecf4b4eaa8e4fb62d8ce3b6876d1a9800ac | |
| parent | d4ec8ef15baaec12d13ffc477e44d86f07fe028c (diff) | |
| download | hyperkitty-85b8ca13fc2e164971f7cbb06c4a0c5b0a1a0770.tar.gz hyperkitty-85b8ca13fc2e164971f7cbb06c4a0c5b0a1a0770.tar.xz hyperkitty-85b8ca13fc2e164971f7cbb06c4a0c5b0a1a0770.zip | |
Better use of pagination on the thread lists
| -rw-r--r-- | hyperkitty/tests/test_views.py | 20 | ||||
| -rw-r--r-- | hyperkitty/views/list.py | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/hyperkitty/tests/test_views.py b/hyperkitty/tests/test_views.py index f9a1ac7..6c1ac83 100644 --- a/hyperkitty/tests/test_views.py +++ b/hyperkitty/tests/test_views.py @@ -325,9 +325,9 @@ class ReattachTestCase(TestCase): request.user = self.user response = reattach(request, "list@example.com", threadid2) now = datetime.datetime.now() - threads = self.store.get_threads("list@example.com", + threads = list(self.store.get_threads("list@example.com", now - datetime.timedelta(days=1), - now + datetime.timedelta(days=1)) + now + datetime.timedelta(days=1))) self.assertEqual(len(threads), 1) self.assertEqual(threads[0].thread_id, threadid1) expected_url = reverse('thread', args=["list@example.com", threadid1]) + "?msg=attached-ok" @@ -343,9 +343,9 @@ class ReattachTestCase(TestCase): request.user = self.user response = reattach(request, "list@example.com", threadid2) now = datetime.datetime.now() - threads = self.store.get_threads("list@example.com", + threads = list(self.store.get_threads("list@example.com", now - datetime.timedelta(days=1), - now + datetime.timedelta(days=1)) + now + datetime.timedelta(days=1))) self.assertEqual(len(threads), 1) self.assertEqual(threads[0].thread_id, threadid1) expected_url = reverse('thread', args=["list@example.com", threadid1]) + "?msg=attached-ok" @@ -361,9 +361,9 @@ class ReattachTestCase(TestCase): response = reattach(request, "list@example.com", threadid) self.assertFalse(self.store.attach_to_thread.called) now = datetime.datetime.now() - threads = self.store.get_threads("list@example.com", + threads = list(self.store.get_threads("list@example.com", now - datetime.timedelta(days=1), - now + datetime.timedelta(days=1)) + now + datetime.timedelta(days=1))) self.assertEqual(len(threads), 2) errormsg = '<div class="flashmsgs"><div class="flashmsg-wrapper"><div class="alert alert-error">' self.assertContains(response, '<div class="alert alert-warning">', @@ -380,9 +380,9 @@ class ReattachTestCase(TestCase): response = reattach(request, "list@example.com", threadid) self.assertFalse(self.store.attach_to_thread.called) now = datetime.datetime.now() - threads = self.store.get_threads("list@example.com", + threads = list(self.store.get_threads("list@example.com", now - datetime.timedelta(days=1), - now + datetime.timedelta(days=1)) + now + datetime.timedelta(days=1))) self.assertEqual(len(threads), 2) errormsg = '<div class="flashmsgs"><div class="flashmsg-wrapper"><div class="alert alert-error">' self.assertContains(response, '<div class="alert alert-warning">', @@ -416,9 +416,9 @@ class ReattachTestCase(TestCase): response = reattach(request, "list@example.com", threadid1) self.assertFalse(self.store.attach_to_thread.called) now = datetime.datetime.now() - threads = self.store.get_threads("list@example.com", + threads = list(self.store.get_threads("list@example.com", now - datetime.timedelta(days=1), - now + datetime.timedelta(days=1)) + now + datetime.timedelta(days=1))) self.assertEqual(len(threads), 2) errormsg = '<div class="flashmsgs"><div class="flashmsg-wrapper"><div class="alert alert-error">' self.assertContains(response, '<div class="alert alert-error">', diff --git a/hyperkitty/views/list.py b/hyperkitty/views/list.py index b04e757..8a6b3db 100644 --- a/hyperkitty/views/list.py +++ b/hyperkitty/views/list.py @@ -85,6 +85,8 @@ def _thread_list(request, mlist, threads, template_name='thread_list.html', extr raise Http404("No archived mailing-list by that name.") store = get_store(request) + threads = paginate(threads, request.GET.get('page')) + participants = set() for thread in threads: if "participants" not in extra_context: @@ -119,8 +121,6 @@ def _thread_list(request, mlist, threads, template_name='thread_list.html', extr # Unread status thread.unread = is_thread_unread(request, mlist.name, thread) - threads = paginate(threads, request.GET.get('page')) - flash_messages = [] flash_msg = request.GET.get("msg") if flash_msg: |