Download as
Browse Code »

Commit fe65f8f7ad034020b50167bd06e7d1bbb97b505b

Authored by AntonioTerceiro
1 parent 279a1e7d
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem313: display just name instead of full_name 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1693 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 9 additions and 1 deletions   Show diff stats
app/views/search/index.rhtml
  Diff comments   View file @fe65f8f
1 -<h2> <%=h @category ? (_('Search results for "%{query}" in %{category}') % { :query => @query, :category => @category.full_name}) : (_('Search results for "%s"') % @query) %> </h2> 1 +<h2> <%=h @category ? (_('Search results for "%{query}" in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Search results for "%s"') % @query) %> </h2>
2 2
3 <%= render :partial => 'display_results' %> 3 <%= render :partial => 'display_results' %>
4 4
test/functional/search_controller_test.rb
  Diff comments   View file @fe65f8f
@@ -493,5 +493,13 @@ class SearchControllerTest &lt; Test::Unit::TestCase @@ -493,5 +493,13 @@ class SearchControllerTest &lt; Test::Unit::TestCase
493 get :index, :category_path => [ 'my-category' ], :query => 'a sample search' 493 get :index, :category_path => [ 'my-category' ], :query => 'a sample search'
494 assert_tag :tag => 'a', :attributes => { :href => "/search?query=a+sample+search" }, :content => 'Search for "a sample search" in the whole site' 494 assert_tag :tag => 'a', :attributes => { :href => "/search?query=a+sample+search" }, :content => 'Search for "a sample search" in the whole site'
495 end 495 end
  496 +
  497 + should 'display only category name in "search results for ..." title' do
  498 + parent = Category.create!(:name => 'Parent Category', :environment => Environment.default)
  499 + child = Category.create!(:name => "Child Category", :environment => Environment.default, :parent => parent)
  500 +
  501 + get :index, :category_path => [ 'parent-category', 'child-category' ], :query => 'a sample search'
  502 + assert_tag :tag => 'h2', :content => /Search results for &quot;a sample search&quot; in &quot;Child Category&quot;/
  503 + end
496 504
497 end 505 end