Download as
Browse Code »

Commit 11b36d0d7e0b6180d4350898b071409ec6d8b2f6

Authored by Gust
1 parent 6fcf510f
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Reverting to work on Django 1.6 too

Showing 3 changed files with 9 additions and 7 deletions   Show diff stats
requirements.txt
  Diff comments   View file @11b36d0
1   -https://www.djangoproject.com/download/1.7c2/tarball/ # Download django 1.7 #
  1 +Django>=1.6.1,<1.7
  2 +South==0.8.1
2 3 psycopg2==2.5.1
3 4 django-piston==0.2.3
4 5 pytz==2011n
... ...
src/colab/custom_settings.py
  Diff comments   View file @11b36d0
... ... @@ -93,6 +93,7 @@ INSTALLED_APPS = INSTALLED_APPS + (
93 93 'accounts',
94 94  
95 95 # Not standard apps
  96 + 'south',
96 97 'raven.contrib.django.raven_compat',
97 98 'cliauth',
98 99 'django_mobile',
... ...
src/super_archives/managers.py
  Diff comments   View file @11b36d0
... ... @@ -6,13 +6,13 @@ import django
6 6 class NotSpamManager(models.Manager):
7 7 """Only return objects which are not marked as spam."""
8 8  
9   - def get_queryset(self):
10   - return super(NotSpamManager, self).get_queryset().exclude(spam=True)
  9 + def get_query_set(self):
  10 + return super(NotSpamManager, self).get_query_set().exclude(spam=True)
11 11  
12 12  
13 13 class HighestScore(NotSpamManager):
14   - def get_queryset(self):
15   - queryset = super(HighestScore, self).get_queryset()
  14 + def get_query_set(self):
  15 + queryset = super(HighestScore, self).get_query_set()
16 16 return queryset.order_by('-score', '-latest_message__received_time')
17 17  
18 18 def from_haystack(self):
... ... @@ -20,11 +20,11 @@ class HighestScore(NotSpamManager):
20 20  
21 21  
22 22 class MostVotedManager(NotSpamManager):
23   - def get_queryset(self):
  23 + def get_query_set(self):
24 24 """Query for the most voted messages sorting by the sum of
25 25 voted and after by date."""
26 26  
27   - queryset = super(MostVotedManager, self).get_queryset()
  27 + queryset = super(MostVotedManager, self).get_query_set()
28 28  
29 29 sql = """
30 30 SELECT
... ...