From ccd4fb6e9eea838bcb652da92a539145dc2f60f3 Mon Sep 17 00:00:00 2001 From: Luan Date: Mon, 14 Oct 2013 15:07:55 -0300 Subject: [PATCH] Fixing descriptions to improve highlight --- src/accounts/search_indexes.py | 7 ++++--- src/proxy/search_indexes.py | 15 +++++++++++---- src/proxy/templates/search/indexes/proxy/revision_text.txt | 4 ++-- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/accounts/search_indexes.py b/src/accounts/search_indexes.py index 12ca539..57f12f8 100644 --- a/src/accounts/search_indexes.py +++ b/src/accounts/search_indexes.py @@ -30,9 +30,10 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable): return 'date_joined' def prepare_description(self, obj): - if obj.institution and obj.role: - return u'{} ({})'.format(obj.institution, obj.role) - return obj.institution if obj.institution else obj.role + return u'{}\n{}\n{}\n{}\n{}\n{}'.format( + obj.institution, obj.role, obj.username, obj.get_full_name(), + obj.google_talk, obj.webpage + ) def prepare_icon_name(self, obj): return u'user' diff --git a/src/proxy/search_indexes.py b/src/proxy/search_indexes.py index ee943c1..c0666cc 100644 --- a/src/proxy/search_indexes.py +++ b/src/proxy/search_indexes.py @@ -13,7 +13,7 @@ class WikiIndex(indexes.SearchIndex, indexes.Indexable): text = indexes.CharField(document=True, use_template=True) url = indexes.CharField(model_attr='get_absolute_url') title = indexes.CharField(model_attr='name') - description = indexes.CharField(model_attr='wiki_text', null=True) + description = indexes.CharField(null=True) author = indexes.CharField(null=True) author_url = indexes.CharField(null=True) created = indexes.DateTimeField(model_attr='created', null=True) @@ -42,6 +42,9 @@ class WikiIndex(indexes.SearchIndex, indexes.Indexable): return author.get_absolute_url() return None + def prepare_description(self, obj): + return u'{}\n{}'.format(obj.wiki_text, obj.collaborators) + def prepare_icon_name(self, obj): return u'file' @@ -54,7 +57,7 @@ class TicketIndex(indexes.SearchIndex, indexes.Indexable): text = indexes.CharField(document=True, use_template=True) url = indexes.CharField(model_attr='get_absolute_url') title = indexes.CharField() - description = indexes.CharField(model_attr='description', null=True) + description = indexes.CharField(null=True) author = indexes.CharField(null=True) author_url = indexes.CharField(null=True) created = indexes.DateTimeField(model_attr='created', null=True) @@ -64,10 +67,8 @@ class TicketIndex(indexes.SearchIndex, indexes.Indexable): tag = indexes.CharField(model_attr='status', null=True) # trac extra fields - summary = indexes.CharField(model_attr='summary', null=True) milestone = indexes.CharField(model_attr='milestone', null=True) component = indexes.CharField(model_attr='component', null=True) - version = indexes.CharField(model_attr='version', null=True) severity = indexes.CharField(model_attr='severity', null=True) reporter = indexes.CharField(model_attr='reporter', null=True) keywords = indexes.CharField(model_attr='keywords', null=True) @@ -91,6 +92,12 @@ class TicketIndex(indexes.SearchIndex, indexes.Indexable): return author.get_absolute_url() return None + def prepare_description(self, obj): + return u'{}\n{}\n{}\n{}\n{}\n{}\n{}'.format( + obj.description, obj.milestone, obj.component, obj.severity, + obj.reporter, obj.keywords, obj.collaborators + ) + def prepare_icon_name(self, obj): return u'tag' diff --git a/src/proxy/templates/search/indexes/proxy/revision_text.txt b/src/proxy/templates/search/indexes/proxy/revision_text.txt index b5e6bd9..64cca83 100644 --- a/src/proxy/templates/search/indexes/proxy/revision_text.txt +++ b/src/proxy/templates/search/indexes/proxy/revision_text.txt @@ -1,7 +1,7 @@ {{ object.repository_name }} {{ object.repository_name|slugify }} -{{ object.revision }} -{{ object.revision|slugify }} +{{ object.rev }} +{{ object.rev|slugify }} {% firstof object.get_author.get_full_name object.author %} {% firstof object.get_author.get_full_name|slugify object.author|slugify %} {{ object.message }} -- libgit2 0.21.2