Resolve ambiguity in Work lists order -- sort by Work.id as a secondary sort key
parent
17c8de9473
commit
fb77d1a08d
|
@ -201,13 +201,13 @@ class WorkListView(ListView):
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
facet = self.kwargs['facet']
|
facet = self.kwargs['facet']
|
||||||
if (facet == 'popular'):
|
if (facet == 'popular'):
|
||||||
return models.Work.objects.filter(wishlists__isnull=False).distinct().annotate(wished=Count('wishlists')).order_by('-wished')
|
return models.Work.objects.filter(wishlists__isnull=False).distinct().annotate(wished=Count('wishlists')).order_by('-wished', 'id')
|
||||||
elif (facet == 'recommended'):
|
elif (facet == 'recommended'):
|
||||||
return models.Work.objects.filter(wishlists__user=recommended_user)
|
return models.Work.objects.filter(wishlists__user=recommended_user)
|
||||||
elif (facet == 'new'):
|
elif (facet == 'new'):
|
||||||
return models.Work.objects.filter(wishlists__isnull=False).distinct().order_by('-created')
|
return models.Work.objects.filter(wishlists__isnull=False).distinct().order_by('-created', 'id')
|
||||||
else:
|
else:
|
||||||
return models.Work.objects.all().order_by('-created')
|
return models.Work.objects.all().order_by('-created', 'id')
|
||||||
|
|
||||||
def get_context_data(self, **kwargs):
|
def get_context_data(self, **kwargs):
|
||||||
context = super(WorkListView, self).get_context_data(**kwargs)
|
context = super(WorkListView, self).get_context_data(**kwargs)
|
||||||
|
|
Loading…
Reference in New Issue