Download as
Browse Code »

Commit 287a3f5db24607b9bd170e26f3a103fe0b5236b6

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

Checking if data was extract from file b4 sending to template

Showing 2 changed files with 4 additions and 1 deletions   Show diff stats
src/accounts/views.py
  Diff comments   View file @287a3f5
@@ -56,7 +56,6 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView): @@ -56,7 +56,6 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
56 56
57 fields_or_lookup = ( 57 fields_or_lookup = (
58 {'collaborators__contains': user.username}, 58 {'collaborators__contains': user.username},
59 - {'description__contains': user.username},  
60 {'author': user.username}, 59 {'author': user.username},
61 ) 60 )
62 61
src/proxy/search_indexes.py
  Diff comments   View file @287a3f5
@@ -50,9 +50,13 @@ class AttachmentIndex(BaseIndex, indexes.Indexable): @@ -50,9 +50,13 @@ class AttachmentIndex(BaseIndex, indexes.Indexable):
50 logger.warning(u'IOError: %s - %s', e.strerror, e.filename) 50 logger.warning(u'IOError: %s - %s', e.strerror, e.filename)
51 return data 51 return data
52 backend = self._get_backend(None) 52 backend = self._get_backend(None)
  53 +
53 extracted_data = backend.extract_file_contents(file_obj) 54 extracted_data = backend.extract_file_contents(file_obj)
54 file_obj.close() 55 file_obj.close()
55 56
  57 + if not extracted_data:
  58 + return data
  59 +
56 t = loader.select_template( 60 t = loader.select_template(
57 ('search/indexes/proxy/attachment_text.txt', ) 61 ('search/indexes/proxy/attachment_text.txt', )
58 ) 62 )