Download as
Browse Code »

Commit cc5dd7a0f919f3a9bd5075474174ece35fdf7a50

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent 6205e6c9
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

ActionItem932: Adding link to general context when in categories

Showing 7 changed files with 37 additions and 0 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @cc5dd7a
... ... @@ -714,6 +714,13 @@ module ApplicationHelper
714 714 title
715 715 end
716 716  
  717 + def search_page_link_to_all(options={})
  718 + if options[:category]
  719 + title = "<div align='center'>" + _('In all categories') + "</div>"
  720 + link_to title, :action => 'assets', :asset => options[:asset], :category_path => []
  721 + end
  722 + end
  723 +
717 724 def template_stylesheet_tag
718 725 if profile.nil?
719 726 stylesheet_link_tag '/designs/templates/default/stylesheets/style.css'
... ...
app/views/search/articles.rhtml
  Diff comments   View file @cc5dd7a
... ... @@ -4,6 +4,9 @@
4 4 :region => @region ? @region.name : nil,
5 5 :distance => @radius } ) %>
6 6  
  7 +<%= search_page_link_to_all( { :asset => params[:asset],
  8 + :category => @category }) %>
  9 +
7 10 <%= render :partial => 'search_form', :locals => { :form_title => @query.blank? ? _('Search') : _("Refine your search"), :simple_search => true } %>
8 11  
9 12 <%# FIXME ARMENGUE %>
... ...
app/views/search/communities.rhtml
  Diff comments   View file @cc5dd7a
... ... @@ -4,6 +4,9 @@
4 4 :region => @region ? @region.name : nil,
5 5 :distance => @radius } ) %>
6 6  
  7 +<%= search_page_link_to_all( { :asset => params[:asset],
  8 + :category => @category }) %>
  9 +
7 10 <%= render :partial => 'search_form', :locals => { :form_title => @query.blank? ? _('Search') : _("Refine your search"), :simple_search => true } %>
8 11  
9 12 <%# FIXME ARMENGUE %>
... ...
app/views/search/enterprises.rhtml
  Diff comments   View file @cc5dd7a
... ... @@ -10,6 +10,9 @@
10 10 <h2><%=h (_('Within %s km from %s') % [@radius, @region.name]) %><h2>
11 11 <% end %>
12 12  
  13 +<%= search_page_link_to_all( { :asset => params[:asset],
  14 + :category => @category }) %>
  15 +
13 16 <%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %>
14 17  
15 18 <% if @categories_menu %>
... ...
app/views/search/people.rhtml
  Diff comments   View file @cc5dd7a
... ... @@ -4,6 +4,9 @@
4 4 :region => @region ? @region.name : nil,
5 5 :distance => @radius } ) %>
6 6  
  7 +<%= search_page_link_to_all( { :asset => params[:asset],
  8 + :category => @category }) %>
  9 +
7 10 <%= render :partial => 'search_form', :locals => { :form_title => @query.blank? ? _('Search') : _("Refine your search"), :simple_search => true } %>
8 11  
9 12 <%# FIXME ARMENGUE %>
... ...
app/views/search/products.rhtml
  Diff comments   View file @cc5dd7a
... ... @@ -4,6 +4,9 @@
4 4 :region => @region ? @region.name : nil,
5 5 :distance => @radius } ) %>
6 6  
  7 +<%= search_page_link_to_all( { :asset => params[:asset],
  8 + :category => @category }) %>
  9 +
7 10 <%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %>
8 11  
9 12 <% if @categories_menu %>
... ...
test/functional/search_controller_test.rb
  Diff comments   View file @cc5dd7a
... ... @@ -957,6 +957,21 @@ class SearchControllerTest &lt; Test::Unit::TestCase
957 957 assert_equal 20, assigns(:results)[:enterprises].total_entries
958 958 end
959 959  
  960 + should 'add link to list in all categories when in a category' do
  961 + ['people', 'enterprises', 'products', 'communities', 'articles'].each do |asset|
  962 + get :index, :asset => asset, :category_path => [ 'my-category' ]
  963 + assert_tag :tag => 'div', :content => 'In all categories'
  964 + end
  965 + end
  966 +
  967 + should 'not add link to list in all categories when not in a category' do
  968 + ['people', 'enterprises', 'products', 'communities', 'articles'].each do |asset|
  969 + get :index, :asset => asset
  970 + assert_no_tag :tag => 'div', :content => 'In all categories'
  971 + end
  972 + end
  973 +
  974 +
960 975 ##################################################################
961 976 ##################################################################
962 977  
... ...