Download as
Browse Code »

Commit ccd4fb6e9eea838bcb652da92a539145dc2f60f3

Authored by Luan
1 parent c778fe07
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

Fixing descriptions to improve highlight

Showing 3 changed files with 17 additions and 9 deletions   Show diff stats
src/accounts/search_indexes.py
  Diff comments   View file @ccd4fb6
@@ -30,9 +30,10 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable): @@ -30,9 +30,10 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable):
30 return 'date_joined' 30 return 'date_joined'
31 31
32 def prepare_description(self, obj): 32 def prepare_description(self, obj):
33 - if obj.institution and obj.role:  
34 - return u'{} ({})'.format(obj.institution, obj.role)  
35 - return obj.institution if obj.institution else obj.role 33 + return u'{}\n{}\n{}\n{}\n{}\n{}'.format(
  34 + obj.institution, obj.role, obj.username, obj.get_full_name(),
  35 + obj.google_talk, obj.webpage
  36 + )
36 37
37 def prepare_icon_name(self, obj): 38 def prepare_icon_name(self, obj):
38 return u'user' 39 return u'user'
src/proxy/search_indexes.py
  Diff comments   View file @ccd4fb6
@@ -13,7 +13,7 @@ class WikiIndex(indexes.SearchIndex, indexes.Indexable): @@ -13,7 +13,7 @@ class WikiIndex(indexes.SearchIndex, indexes.Indexable):
13 text = indexes.CharField(document=True, use_template=True) 13 text = indexes.CharField(document=True, use_template=True)
14 url = indexes.CharField(model_attr='get_absolute_url') 14 url = indexes.CharField(model_attr='get_absolute_url')
15 title = indexes.CharField(model_attr='name') 15 title = indexes.CharField(model_attr='name')
16 - description = indexes.CharField(model_attr='wiki_text', null=True) 16 + description = indexes.CharField(null=True)
17 author = indexes.CharField(null=True) 17 author = indexes.CharField(null=True)
18 author_url = indexes.CharField(null=True) 18 author_url = indexes.CharField(null=True)
19 created = indexes.DateTimeField(model_attr='created', null=True) 19 created = indexes.DateTimeField(model_attr='created', null=True)
@@ -42,6 +42,9 @@ class WikiIndex(indexes.SearchIndex, indexes.Indexable): @@ -42,6 +42,9 @@ class WikiIndex(indexes.SearchIndex, indexes.Indexable):
42 return author.get_absolute_url() 42 return author.get_absolute_url()
43 return None 43 return None
44 44
  45 + def prepare_description(self, obj):
  46 + return u'{}\n{}'.format(obj.wiki_text, obj.collaborators)
  47 +
45 def prepare_icon_name(self, obj): 48 def prepare_icon_name(self, obj):
46 return u'file' 49 return u'file'
47 50
@@ -54,7 +57,7 @@ class TicketIndex(indexes.SearchIndex, indexes.Indexable): @@ -54,7 +57,7 @@ class TicketIndex(indexes.SearchIndex, indexes.Indexable):
54 text = indexes.CharField(document=True, use_template=True) 57 text = indexes.CharField(document=True, use_template=True)
55 url = indexes.CharField(model_attr='get_absolute_url') 58 url = indexes.CharField(model_attr='get_absolute_url')
56 title = indexes.CharField() 59 title = indexes.CharField()
57 - description = indexes.CharField(model_attr='description', null=True) 60 + description = indexes.CharField(null=True)
58 author = indexes.CharField(null=True) 61 author = indexes.CharField(null=True)
59 author_url = indexes.CharField(null=True) 62 author_url = indexes.CharField(null=True)
60 created = indexes.DateTimeField(model_attr='created', null=True) 63 created = indexes.DateTimeField(model_attr='created', null=True)
@@ -64,10 +67,8 @@ class TicketIndex(indexes.SearchIndex, indexes.Indexable): @@ -64,10 +67,8 @@ class TicketIndex(indexes.SearchIndex, indexes.Indexable):
64 tag = indexes.CharField(model_attr='status', null=True) 67 tag = indexes.CharField(model_attr='status', null=True)
65 68
66 # trac extra fields 69 # trac extra fields
67 - summary = indexes.CharField(model_attr='summary', null=True)  
68 milestone = indexes.CharField(model_attr='milestone', null=True) 70 milestone = indexes.CharField(model_attr='milestone', null=True)
69 component = indexes.CharField(model_attr='component', null=True) 71 component = indexes.CharField(model_attr='component', null=True)
70 - version = indexes.CharField(model_attr='version', null=True)  
71 severity = indexes.CharField(model_attr='severity', null=True) 72 severity = indexes.CharField(model_attr='severity', null=True)
72 reporter = indexes.CharField(model_attr='reporter', null=True) 73 reporter = indexes.CharField(model_attr='reporter', null=True)
73 keywords = indexes.CharField(model_attr='keywords', null=True) 74 keywords = indexes.CharField(model_attr='keywords', null=True)
@@ -91,6 +92,12 @@ class TicketIndex(indexes.SearchIndex, indexes.Indexable): @@ -91,6 +92,12 @@ class TicketIndex(indexes.SearchIndex, indexes.Indexable):
91 return author.get_absolute_url() 92 return author.get_absolute_url()
92 return None 93 return None
93 94
  95 + def prepare_description(self, obj):
  96 + return u'{}\n{}\n{}\n{}\n{}\n{}\n{}'.format(
  97 + obj.description, obj.milestone, obj.component, obj.severity,
  98 + obj.reporter, obj.keywords, obj.collaborators
  99 + )
  100 +
94 def prepare_icon_name(self, obj): 101 def prepare_icon_name(self, obj):
95 return u'tag' 102 return u'tag'
96 103
src/proxy/templates/search/indexes/proxy/revision_text.txt
  Diff comments   View file @ccd4fb6
1 {{ object.repository_name }} 1 {{ object.repository_name }}
2 {{ object.repository_name|slugify }} 2 {{ object.repository_name|slugify }}
3 -{{ object.revision }}  
4 -{{ object.revision|slugify }} 3 +{{ object.rev }}
  4 +{{ object.rev|slugify }}
5 {% firstof object.get_author.get_full_name object.author %} 5 {% firstof object.get_author.get_full_name object.author %}
6 {% firstof object.get_author.get_full_name|slugify object.author|slugify %} 6 {% firstof object.get_author.get_full_name|slugify object.author|slugify %}
7 {{ object.message }} 7 {{ object.message }}