Commit c68e8463ff0d4e9d022a72fcc5833956e6deaec0
1 parent
b9b464ed
Exists in
master
and in
39 other branches
get_query_set renamed to get_queryset in Django 1.7
Showing
1 changed file
with
7 additions
and
6 deletions
Show diff stats
src/super_archives/managers.py
... | ... | @@ -3,16 +3,17 @@ from django.db import models |
3 | 3 | from haystack.query import SearchQuerySet |
4 | 4 | import django |
5 | 5 | |
6 | + | |
6 | 7 | class NotSpamManager(models.Manager): |
7 | 8 | """Only return objects which are not marked as spam.""" |
8 | 9 | |
9 | - def get_query_set(self): | |
10 | - return super(NotSpamManager, self).get_query_set().exclude(spam=True) | |
10 | + def get_queryset(self): | |
11 | + return super(NotSpamManager, self).get_queryset().exclude(spam=True) | |
11 | 12 | |
12 | 13 | |
13 | 14 | class HighestScore(NotSpamManager): |
14 | - def get_query_set(self): | |
15 | - queryset = super(HighestScore, self).get_query_set() | |
15 | + def get_queryset(self): | |
16 | + queryset = super(HighestScore, self).get_queryset() | |
16 | 17 | return queryset.order_by('-score', '-latest_message__received_time') |
17 | 18 | |
18 | 19 | def from_haystack(self): |
... | ... | @@ -20,11 +21,11 @@ class HighestScore(NotSpamManager): |
20 | 21 | |
21 | 22 | |
22 | 23 | class MostVotedManager(NotSpamManager): |
23 | - def get_query_set(self): | |
24 | + def get_queryset(self): | |
24 | 25 | """Query for the most voted messages sorting by the sum of |
25 | 26 | voted and after by date.""" |
26 | 27 | |
27 | - queryset = super(MostVotedManager, self).get_query_set() | |
28 | + queryset = super(MostVotedManager, self).get_queryset() | |
28 | 29 | |
29 | 30 | sql = """ |
30 | 31 | SELECT | ... | ... |