Commit ccd4fb6e9eea838bcb652da92a539145dc2f60f3
1 parent
c778fe07
Exists in
master
and in
39 other branches
Fixing descriptions to improve highlight
Showing
3 changed files
with
17 additions
and
9 deletions
Show diff stats
src/accounts/search_indexes.py
... | ... | @@ -30,9 +30,10 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable): |
30 | 30 | return 'date_joined' |
31 | 31 | |
32 | 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 | 38 | def prepare_icon_name(self, obj): |
38 | 39 | return u'user' | ... | ... |
src/proxy/search_indexes.py
... | ... | @@ -13,7 +13,7 @@ class WikiIndex(indexes.SearchIndex, indexes.Indexable): |
13 | 13 | text = indexes.CharField(document=True, use_template=True) |
14 | 14 | url = indexes.CharField(model_attr='get_absolute_url') |
15 | 15 | title = indexes.CharField(model_attr='name') |
16 | - description = indexes.CharField(model_attr='wiki_text', null=True) | |
16 | + description = indexes.CharField(null=True) | |
17 | 17 | author = indexes.CharField(null=True) |
18 | 18 | author_url = indexes.CharField(null=True) |
19 | 19 | created = indexes.DateTimeField(model_attr='created', null=True) |
... | ... | @@ -42,6 +42,9 @@ class WikiIndex(indexes.SearchIndex, indexes.Indexable): |
42 | 42 | return author.get_absolute_url() |
43 | 43 | return None |
44 | 44 | |
45 | + def prepare_description(self, obj): | |
46 | + return u'{}\n{}'.format(obj.wiki_text, obj.collaborators) | |
47 | + | |
45 | 48 | def prepare_icon_name(self, obj): |
46 | 49 | return u'file' |
47 | 50 | |
... | ... | @@ -54,7 +57,7 @@ class TicketIndex(indexes.SearchIndex, indexes.Indexable): |
54 | 57 | text = indexes.CharField(document=True, use_template=True) |
55 | 58 | url = indexes.CharField(model_attr='get_absolute_url') |
56 | 59 | title = indexes.CharField() |
57 | - description = indexes.CharField(model_attr='description', null=True) | |
60 | + description = indexes.CharField(null=True) | |
58 | 61 | author = indexes.CharField(null=True) |
59 | 62 | author_url = indexes.CharField(null=True) |
60 | 63 | created = indexes.DateTimeField(model_attr='created', null=True) |
... | ... | @@ -64,10 +67,8 @@ class TicketIndex(indexes.SearchIndex, indexes.Indexable): |
64 | 67 | tag = indexes.CharField(model_attr='status', null=True) |
65 | 68 | |
66 | 69 | # trac extra fields |
67 | - summary = indexes.CharField(model_attr='summary', null=True) | |
68 | 70 | milestone = indexes.CharField(model_attr='milestone', null=True) |
69 | 71 | component = indexes.CharField(model_attr='component', null=True) |
70 | - version = indexes.CharField(model_attr='version', null=True) | |
71 | 72 | severity = indexes.CharField(model_attr='severity', null=True) |
72 | 73 | reporter = indexes.CharField(model_attr='reporter', null=True) |
73 | 74 | keywords = indexes.CharField(model_attr='keywords', null=True) |
... | ... | @@ -91,6 +92,12 @@ class TicketIndex(indexes.SearchIndex, indexes.Indexable): |
91 | 92 | return author.get_absolute_url() |
92 | 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 | 101 | def prepare_icon_name(self, obj): |
95 | 102 | return u'tag' |
96 | 103 | ... | ... |
src/proxy/templates/search/indexes/proxy/revision_text.txt
1 | 1 | {{ object.repository_name }} |
2 | 2 | {{ object.repository_name|slugify }} |
3 | -{{ object.revision }} | |
4 | -{{ object.revision|slugify }} | |
3 | +{{ object.rev }} | |
4 | +{{ object.rev|slugify }} | |
5 | 5 | {% firstof object.get_author.get_full_name object.author %} |
6 | 6 | {% firstof object.get_author.get_full_name|slugify object.author|slugify %} |
7 | 7 | {{ object.message }} | ... | ... |