Download as
Browse Code »

Commit df8735d724d0cf9a1ce03c48ce79ae5b12272a56

Authored by MoisesMachado
1 parent 68daacb6
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

ActionItem501: fixed the args of the search_page_title helper 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2206 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 3 additions and 3 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @df8735d
... ... @@ -625,7 +625,7 @@ module ApplicationHelper
625 625 def search_page_title(title, options={})
626 626 title = "<h1>" + title + "</h1>"
627 627 title += "<h2 align='center'>" + _("Searched for '%s'") % options[:query] + "</h2>" if !options[:query].blank?
628   - title += "<h2 align='center'>" + _("In category %s") % options[:category].name + "</h2>" if !options[:category].blank?
  628 + title += "<h2 align='center'>" + _("In category %s") % options[:category] + "</h2>" if !options[:category].blank?
629 629 title += "<h2 align='center'>" + _("within %d from %s") % [options[:distance], options[:region]] + "</h2>" if !options[:distance].blank? && !options[:region].blank?
630 630 title += "<h2 align='center'>" + _("%d results found") % options[:total_results] + "</h2>" if !options[:total_results].blank?
631 631 title
... ...
app/views/search/people.rhtml
  Diff comments   View file @df8735d
1 1 <%= search_page_title( _('People'), { :query => @query,
2   - :category => @category,
  2 + :category => @category ? @category.name : nil,
3 3 :total_results => @total_results,
4 4 :region => @region ? @region.name : nil,
5 5 :distance => @radius } ) %>
... ...
app/views/search/products.rhtml
  Diff comments   View file @df8735d
1 1 <%= search_page_title( _('Products and Services'), { :query => @query,
2   - :category => @category,
  2 + :category => @category ? @category.name : nil,
3 3 :total_results => @total_results,
4 4 :region => @region ? @region.name : nil,
5 5 :distance => @radius } ) %>
... ...