Commit 7c7109dc76b97204622c3af82da8015958b6d737
1 parent
1629938c
Exists in
master
and in
39 other branches
Uncommented mail counters
Showing
2 changed files
with
12 additions
and
12 deletions
Show diff stats
colab/accounts/search_indexes.py
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | from haystack import indexes | 3 | from haystack import indexes |
| 4 | from django.db.models import Count | 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 | from .models import User | 7 | from .models import User |
| 8 | 8 | ||
| 9 | 9 | ||
| @@ -34,11 +34,11 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable): | @@ -34,11 +34,11 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable): | ||
| 34 | def get_model(self): | 34 | def get_model(self): |
| 35 | return User | 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 | def prepare(self, obj): | 43 | def prepare(self, obj): |
| 44 | prepared_data = super(UserIndex, self).prepare(obj) | 44 | prepared_data = super(UserIndex, self).prepare(obj) |
colab/badger/utils.py
| @@ -26,16 +26,16 @@ def get_ticket_counters(): | @@ -26,16 +26,16 @@ def get_ticket_counters(): | ||
| 26 | 26 | ||
| 27 | 27 | ||
| 28 | def get_users_counters(): | 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 | users_counters = {} | 33 | users_counters = {} |
| 34 | for user in User.objects.annotate(message_count=Count('emails__message')): | 34 | for user in User.objects.annotate(message_count=Count('emails__message')): |
| 35 | users_counters[user.username] = { | 35 | users_counters[user.username] = { |
| 36 | 'messages': user.message_count, | 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 | return users_counters | 41 | return users_counters |