Download as
Browse Code »

Commit 6c0daae0cbf7d10a4bd5f9db562f2af52fc24b6f

Authored by AntonioTerceiro
1 parent 27983b88
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem501: hiding "see in map" for stuff that has no geographical 

information (yet)

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2271 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 4 additions and 3 deletions   Show diff stats
app/helpers/search_helper.rb
  Diff comments   View file @6c0daae
@@ -15,9 +15,9 @@ module SearchHelper @@ -15,9 +15,9 @@ module SearchHelper
15 (query.downcase.scan(/"[^"]*"?|'[^']*'?|[^'"\s]+/) - (STOP_WORDS[locale] || [])).join(' ') 15 (query.downcase.scan(/"[^"]*"?|'[^']*'?|[^'"\s]+/) - (STOP_WORDS[locale] || [])).join(' ')
16 end 16 end
17 17
18 - def display_results 18 + def display_results(use_map = true)
19 19
20 - unless GoogleMaps.enabled? 20 + unless use_map && GoogleMaps.enabled?
21 return render(:partial => 'display_results') 21 return render(:partial => 'display_results')
22 end 22 end
23 23
app/views/search/people.rhtml
  Diff comments   View file @6c0daae
@@ -6,7 +6,8 @@ @@ -6,7 +6,8 @@
6 6
7 <%= render :partial => 'search_form', :locals => { :form_title => @query.blank? ? _('Search') : _("Refine your search"), :simple_search => true } %> 7 <%= render :partial => 'search_form', :locals => { :form_title => @query.blank? ? _('Search') : _("Refine your search"), :simple_search => true } %>
8 8
9 -<%= display_results %> 9 +<%# FIXME ARMENGUE %>
  10 +<%= display_results(false) %>
10 11
11 <%= pagination_links @results.values.first %> 12 <%= pagination_links @results.values.first %>
12 13