Download as
Browse Code »

Commit b615983c3d4302cb6f7711ad59b7ec825dee130f

Authored by Luan
1 parent 3dfea19e
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

Changing filters to use haystack

Showing 1 changed file with 17 additions and 11 deletions   Show diff stats
src/badger/utils.py
  Diff comments   View file @b615983
... ... @@ -2,15 +2,28 @@
2 2  
3 3 from django.db.models import Count
4 4  
  5 +from haystack.query import SearchQuerySet
  6 +
5 7 from proxy.models import Revision, Ticket, Wiki
6 8 from super_archives.models import Message
7 9  
8 10  
9 11 def get_counters_to_badge(user):
10   - count_revisions = Revision.objects.filter(author=user.username).count()
11   - count_tickets = Ticket.objects.filter(author=user.username).count()
12   - count_wikis = Wiki.objects.filter(author=user.username).count()
13   -
  12 + # count_revisions = Revision.objects.filter(author=user.username).count()
  13 + # count_tickets = Ticket.objects.filter(author=user.username).count()
  14 + # count_wikis = Wiki.objects.filter(author=user.username).count()
  15 + count_revisions = SearchQuerySet().filter(
  16 + type='changeset',
  17 + author=user.username
  18 + ).count()
  19 + count_tickets = SearchQuerySet().filter(
  20 + type='ticket',
  21 + author=user.username
  22 + ).count()
  23 + count_wikis = SearchQuerySet().filter(
  24 + type='wiki',
  25 + author=user.username
  26 + ).count()
14 27 return dict(
15 28 messages=user.emails.aggregate(Count('message'))['message__count'],
16 29 revisions=count_revisions,
... ... @@ -18,10 +31,3 @@ def get_counters_to_badge(user):
18 31 wikis=count_wikis,
19 32 contributions=count_revisions + count_tickets + count_wikis,
20 33 )
21   -
22   -# using haystack
23   -# sqs = SearchQuerySet()
24   -# sqs.filter(type='changeset', author=user.get_full_name()).count()
25   -# sqs.filter(type='wiki', author=user.get_full_name()).count()
26   -# sqs.filter(type='ticket', author=user.get_full_name()).count()
27   -# Should it use the author_and_username attr too?
... ...