Skip to content

Commit

Permalink
Merge pull request #161 from colab/fix_default_ordering
Browse files Browse the repository at this point in the history
Made latest default ordering for list view
  • Loading branch information
macartur committed Mar 2, 2016
2 parents 7c3c875 + f7063c9 commit 4089870
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 16 deletions.
10 changes: 0 additions & 10 deletions colab/super_archives/tests/test_mailinglist_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,6 @@ def setUp(self):
def authenticate_user(self):
self.client.login(username=self.username, password='admin')

def test_get_query_set_with_no_order(self):
response = self.client.get('/archives/mailinglist/lista')

self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['thread_list']), 1)
self.assertEqual(response.context['thread_list'][0].mailinglist.name,
'lista')
self.assertEqual(response.context['thread_list'][0].subject_token,
'Subject2')

def test_get_query_set_with_latest_order(self):
response = self.client.get(
'/archives/mailinglist/publiclist?order=latest'
Expand Down
9 changes: 3 additions & 6 deletions colab/super_archives/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -369,13 +369,10 @@ def get_queryset(self):

query = Q(mailinglist__name__iexact=mailinglist_name)

order = self.request.GET.get('order')
order = self.request.GET.get('order', 'latest')
order = self.order_data.get(order)

if order:
result = Thread.objects.filter(query).order_by(order['field'])
else:
result = Thread.objects.filter(query)
result = Thread.objects.filter(query).order_by(order['field'])

return result

Expand All @@ -385,7 +382,7 @@ def get_context_data(self, **kwargs):

context['mailinglist'] = mailinglist
context['order_data'] = self.order_data
context['selected'] = self.request.GET.get('order')
context['selected'] = self.request.GET.get('order', 'latest')

return context

Expand Down

0 comments on commit 4089870

Please sign in to comment.