From 7c7109dc76b97204622c3af82da8015958b6d737 Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Tue, 4 Nov 2014 18:42:02 -0200 Subject: [PATCH] Uncommented mail counters --- colab/accounts/search_indexes.py | 12 ++++++------ colab/badger/utils.py | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/colab/accounts/search_indexes.py b/colab/accounts/search_indexes.py index 363093c..0aeac49 100644 --- a/colab/accounts/search_indexes.py +++ b/colab/accounts/search_indexes.py @@ -3,7 +3,7 @@ from haystack import indexes from django.db.models import Count -#from colab.badger.utils import get_users_counters +from colab.badger.utils import get_users_counters from .models import User @@ -34,11 +34,11 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable): def get_model(self): return User - #@property - #def badge_counters(self): - # if not hasattr(self, '_badge_counters'): - # self._badge_counters = get_users_counters() - # return self._badge_counters + @property + def badge_counters(self): + if not hasattr(self, '_badge_counters'): + self._badge_counters = get_users_counters() + return self._badge_counters def prepare(self, obj): prepared_data = super(UserIndex, self).prepare(obj) diff --git a/colab/badger/utils.py b/colab/badger/utils.py index 728b48e..bdb9e8a 100644 --- a/colab/badger/utils.py +++ b/colab/badger/utils.py @@ -26,16 +26,16 @@ def get_ticket_counters(): def get_users_counters(): - wiki_counters = get_wiki_counters() - revision_counters = get_revision_counters() - ticket_counters = get_ticket_counters() + #wiki_counters = get_wiki_counters() + #revision_counters = get_revision_counters() + #ticket_counters = get_ticket_counters() users_counters = {} for user in User.objects.annotate(message_count=Count('emails__message')): users_counters[user.username] = { 'messages': user.message_count, - 'wikis': wiki_counters.get(user.username, 0), - 'revisions': revision_counters.get(user.username, 0), - 'tickets': ticket_counters.get(user.username, 0), + #'wikis': wiki_counters.get(user.username, 0), + #'revisions': revision_counters.get(user.username, 0), + #'tickets': ticket_counters.get(user.username, 0), } return users_counters -- libgit2 0.21.2