Download as
Browse Code »

Commit 7c7109dc76b97204622c3af82da8015958b6d737

Authored by Sergio Oliveira
1 parent 1629938c
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

Uncommented mail counters

Showing 2 changed files with 12 additions and 12 deletions   Show diff stats
colab/accounts/search_indexes.py
  Diff comments   View file @7c7109d
... ... @@ -3,7 +3,7 @@
3 3 from haystack import indexes
4 4 from django.db.models import Count
5 5  
6   -#from colab.badger.utils import get_users_counters
  6 +from colab.badger.utils import get_users_counters
7 7 from .models import User
8 8  
9 9  
... ... @@ -34,11 +34,11 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable):
34 34 def get_model(self):
35 35 return User
36 36  
37   - #@property
38   - #def badge_counters(self):
39   - # if not hasattr(self, '_badge_counters'):
40   - # self._badge_counters = get_users_counters()
41   - # return self._badge_counters
  37 + @property
  38 + def badge_counters(self):
  39 + if not hasattr(self, '_badge_counters'):
  40 + self._badge_counters = get_users_counters()
  41 + return self._badge_counters
42 42  
43 43 def prepare(self, obj):
44 44 prepared_data = super(UserIndex, self).prepare(obj)
... ...
colab/badger/utils.py
  Diff comments   View file @7c7109d
... ... @@ -26,16 +26,16 @@ def get_ticket_counters():
26 26  
27 27  
28 28 def get_users_counters():
29   - wiki_counters = get_wiki_counters()
30   - revision_counters = get_revision_counters()
31   - ticket_counters = get_ticket_counters()
  29 + #wiki_counters = get_wiki_counters()
  30 + #revision_counters = get_revision_counters()
  31 + #ticket_counters = get_ticket_counters()
32 32  
33 33 users_counters = {}
34 34 for user in User.objects.annotate(message_count=Count('emails__message')):
35 35 users_counters[user.username] = {
36 36 'messages': user.message_count,
37   - 'wikis': wiki_counters.get(user.username, 0),
38   - 'revisions': revision_counters.get(user.username, 0),
39   - 'tickets': ticket_counters.get(user.username, 0),
  37 + #'wikis': wiki_counters.get(user.username, 0),
  38 + #'revisions': revision_counters.get(user.username, 0),
  39 + #'tickets': ticket_counters.get(user.username, 0),
40 40 }
41 41 return users_counters
... ...