Download as
Browse Code »

Commit c778fe07fb6d25a0d2b036dbe4ba6e10dacbec3b

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

Minor fix on author message search index

Showing 1 changed file with 3 additions and 8 deletions   Show diff stats
src/super_archives/search_indexes.py
  Diff comments   View file @c778fe0
@@ -12,7 +12,9 @@ class MessageIndex(indexes.SearchIndex, indexes.Indexable): @@ -12,7 +12,9 @@ class MessageIndex(indexes.SearchIndex, indexes.Indexable):
12 title = indexes.CharField(model_attr='subject_clean') 12 title = indexes.CharField(model_attr='subject_clean')
13 description = indexes.CharField(model_attr='body') 13 description = indexes.CharField(model_attr='body')
14 modified = indexes.DateTimeField(model_attr='received_time') 14 modified = indexes.DateTimeField(model_attr='received_time')
15 - author = indexes.CharField(null=True) 15 + author = indexes.CharField(
  16 + model_attr='from_address__get_full_name', null=True
  17 + )
16 author_url = indexes.CharField(null=True) 18 author_url = indexes.CharField(null=True)
17 type = indexes.CharField() 19 type = indexes.CharField()
18 icon_name = indexes.CharField() 20 icon_name = indexes.CharField()
@@ -28,13 +30,6 @@ class MessageIndex(indexes.SearchIndex, indexes.Indexable): @@ -28,13 +30,6 @@ class MessageIndex(indexes.SearchIndex, indexes.Indexable):
28 def get_updated_field(self): 30 def get_updated_field(self):
29 return 'received_time' 31 return 'received_time'
30 32
31 - def prepare_author(self, obj):  
32 - if obj.from_address.user:  
33 - return obj.from_address.user.get_full_name()  
34 - elif obj.from_address.get_full_name():  
35 - return obj.from_address.get_full_name()  
36 - return obj.from_address.real_name  
37 -  
38 def prepare_author_url(self, obj): 33 def prepare_author_url(self, obj):
39 if obj.from_address.user: 34 if obj.from_address.user:
40 return obj.from_address.user.get_absolute_url() 35 return obj.from_address.user.get_absolute_url()