Download as
Browse Code »

Commit 1629938cd11732079f3744743325f85cb5652911

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

Commeting out trac deps

Showing 1 changed file with 18 additions and 18 deletions   Show diff stats
colab/accounts/search_indexes.py
  Diff comments   View file @1629938
@@ -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
@@ -26,28 +26,28 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable): @@ -26,28 +26,28 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable):
26 stored=False) 26 stored=False)
27 webpage = indexes.CharField(model_attr='webpage', null=True, stored=False) 27 webpage = indexes.CharField(model_attr='webpage', null=True, stored=False)
28 message_count = indexes.IntegerField(stored=False) 28 message_count = indexes.IntegerField(stored=False)
29 - changeset_count = indexes.IntegerField(stored=False)  
30 - ticket_count = indexes.IntegerField(stored=False)  
31 - wiki_count = indexes.IntegerField(stored=False) 29 + #changeset_count = indexes.IntegerField(stored=False)
  30 + #ticket_count = indexes.IntegerField(stored=False)
  31 + #wiki_count = indexes.IntegerField(stored=False)
32 contribution_count = indexes.IntegerField(stored=False) 32 contribution_count = indexes.IntegerField(stored=False)
33 33
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)
45 45
46 prepared_data['contribution_count'] = sum(( 46 prepared_data['contribution_count'] = sum((
47 self.prepared_data['message_count'], 47 self.prepared_data['message_count'],
48 - self.prepared_data['changeset_count'],  
49 - self.prepared_data['ticket_count'],  
50 - self.prepared_data['wiki_count'] 48 + # self.prepared_data['changeset_count'],
  49 + # self.prepared_data['ticket_count'],
  50 + # self.prepared_data['wiki_count']
51 )) 51 ))
52 52
53 return prepared_data 53 return prepared_data
@@ -66,14 +66,14 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable): @@ -66,14 +66,14 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable):
66 def prepare_message_count(self, obj): 66 def prepare_message_count(self, obj):
67 return self.badge_counters[obj.username]['messages'] 67 return self.badge_counters[obj.username]['messages']
68 68
69 - def prepare_changeset_count(self, obj):  
70 - return self.badge_counters[obj.username]['revisions'] 69 + #def prepare_changeset_count(self, obj):
  70 + # return self.badge_counters[obj.username]['revisions']
71 71
72 - def prepare_ticket_count(self, obj):  
73 - return self.badge_counters[obj.username]['tickets'] 72 + #def prepare_ticket_count(self, obj):
  73 + # return self.badge_counters[obj.username]['tickets']
74 74
75 - def prepare_wiki_count(self, obj):  
76 - return self.badge_counters[obj.username]['wikis'] 75 + #def prepare_wiki_count(self, obj):
  76 + # return self.badge_counters[obj.username]['wikis']
77 77
78 def index_queryset(self, using=None): 78 def index_queryset(self, using=None):
79 return self.get_model().objects.filter(is_active=True) 79 return self.get_model().objects.filter(is_active=True)