diff --git a/colab/accounts/search_indexes.py b/colab/accounts/search_indexes.py index 6b638f2..363093c 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 @@ -26,28 +26,28 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable): stored=False) webpage = indexes.CharField(model_attr='webpage', null=True, stored=False) message_count = indexes.IntegerField(stored=False) - changeset_count = indexes.IntegerField(stored=False) - ticket_count = indexes.IntegerField(stored=False) - wiki_count = indexes.IntegerField(stored=False) + #changeset_count = indexes.IntegerField(stored=False) + #ticket_count = indexes.IntegerField(stored=False) + #wiki_count = indexes.IntegerField(stored=False) contribution_count = indexes.IntegerField(stored=False) 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) prepared_data['contribution_count'] = sum(( self.prepared_data['message_count'], - self.prepared_data['changeset_count'], - self.prepared_data['ticket_count'], - self.prepared_data['wiki_count'] + # self.prepared_data['changeset_count'], + # self.prepared_data['ticket_count'], + # self.prepared_data['wiki_count'] )) return prepared_data @@ -66,14 +66,14 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable): def prepare_message_count(self, obj): return self.badge_counters[obj.username]['messages'] - def prepare_changeset_count(self, obj): - return self.badge_counters[obj.username]['revisions'] + #def prepare_changeset_count(self, obj): + # return self.badge_counters[obj.username]['revisions'] - def prepare_ticket_count(self, obj): - return self.badge_counters[obj.username]['tickets'] + #def prepare_ticket_count(self, obj): + # return self.badge_counters[obj.username]['tickets'] - def prepare_wiki_count(self, obj): - return self.badge_counters[obj.username]['wikis'] + #def prepare_wiki_count(self, obj): + # return self.badge_counters[obj.username]['wikis'] def index_queryset(self, using=None): return self.get_model().objects.filter(is_active=True) -- libgit2 0.21.2