Commit cc5dd7a0f919f3a9bd5075474174ece35fdf7a50
Committed by
Antonio Terceiro
1 parent
6205e6c9
Exists in
master
and in
29 other branches
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
@@ -714,6 +714,13 @@ module ApplicationHelper | @@ -714,6 +714,13 @@ module ApplicationHelper | ||
714 | title | 714 | title |
715 | end | 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 | def template_stylesheet_tag | 724 | def template_stylesheet_tag |
718 | if profile.nil? | 725 | if profile.nil? |
719 | stylesheet_link_tag '/designs/templates/default/stylesheets/style.css' | 726 | stylesheet_link_tag '/designs/templates/default/stylesheets/style.css' |
app/views/search/articles.rhtml
@@ -4,6 +4,9 @@ | @@ -4,6 +4,9 @@ | ||
4 | :region => @region ? @region.name : nil, | 4 | :region => @region ? @region.name : nil, |
5 | :distance => @radius } ) %> | 5 | :distance => @radius } ) %> |
6 | 6 | ||
7 | +<%= search_page_link_to_all( { :asset => params[:asset], | ||
8 | + :category => @category }) %> | ||
9 | + | ||
7 | <%= render :partial => 'search_form', :locals => { :form_title => @query.blank? ? _('Search') : _("Refine your search"), :simple_search => true } %> | 10 | <%= render :partial => 'search_form', :locals => { :form_title => @query.blank? ? _('Search') : _("Refine your search"), :simple_search => true } %> |
8 | 11 | ||
9 | <%# FIXME ARMENGUE %> | 12 | <%# FIXME ARMENGUE %> |
app/views/search/communities.rhtml
@@ -4,6 +4,9 @@ | @@ -4,6 +4,9 @@ | ||
4 | :region => @region ? @region.name : nil, | 4 | :region => @region ? @region.name : nil, |
5 | :distance => @radius } ) %> | 5 | :distance => @radius } ) %> |
6 | 6 | ||
7 | +<%= search_page_link_to_all( { :asset => params[:asset], | ||
8 | + :category => @category }) %> | ||
9 | + | ||
7 | <%= render :partial => 'search_form', :locals => { :form_title => @query.blank? ? _('Search') : _("Refine your search"), :simple_search => true } %> | 10 | <%= render :partial => 'search_form', :locals => { :form_title => @query.blank? ? _('Search') : _("Refine your search"), :simple_search => true } %> |
8 | 11 | ||
9 | <%# FIXME ARMENGUE %> | 12 | <%# FIXME ARMENGUE %> |
app/views/search/enterprises.rhtml
@@ -10,6 +10,9 @@ | @@ -10,6 +10,9 @@ | ||
10 | <h2><%=h (_('Within %s km from %s') % [@radius, @region.name]) %><h2> | 10 | <h2><%=h (_('Within %s km from %s') % [@radius, @region.name]) %><h2> |
11 | <% end %> | 11 | <% end %> |
12 | 12 | ||
13 | +<%= search_page_link_to_all( { :asset => params[:asset], | ||
14 | + :category => @category }) %> | ||
15 | + | ||
13 | <%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %> | 16 | <%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %> |
14 | 17 | ||
15 | <% if @categories_menu %> | 18 | <% if @categories_menu %> |
app/views/search/people.rhtml
@@ -4,6 +4,9 @@ | @@ -4,6 +4,9 @@ | ||
4 | :region => @region ? @region.name : nil, | 4 | :region => @region ? @region.name : nil, |
5 | :distance => @radius } ) %> | 5 | :distance => @radius } ) %> |
6 | 6 | ||
7 | +<%= search_page_link_to_all( { :asset => params[:asset], | ||
8 | + :category => @category }) %> | ||
9 | + | ||
7 | <%= render :partial => 'search_form', :locals => { :form_title => @query.blank? ? _('Search') : _("Refine your search"), :simple_search => true } %> | 10 | <%= render :partial => 'search_form', :locals => { :form_title => @query.blank? ? _('Search') : _("Refine your search"), :simple_search => true } %> |
8 | 11 | ||
9 | <%# FIXME ARMENGUE %> | 12 | <%# FIXME ARMENGUE %> |
app/views/search/products.rhtml
@@ -4,6 +4,9 @@ | @@ -4,6 +4,9 @@ | ||
4 | :region => @region ? @region.name : nil, | 4 | :region => @region ? @region.name : nil, |
5 | :distance => @radius } ) %> | 5 | :distance => @radius } ) %> |
6 | 6 | ||
7 | +<%= search_page_link_to_all( { :asset => params[:asset], | ||
8 | + :category => @category }) %> | ||
9 | + | ||
7 | <%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %> | 10 | <%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %> |
8 | 11 | ||
9 | <% if @categories_menu %> | 12 | <% if @categories_menu %> |
test/functional/search_controller_test.rb
@@ -957,6 +957,21 @@ class SearchControllerTest < Test::Unit::TestCase | @@ -957,6 +957,21 @@ class SearchControllerTest < Test::Unit::TestCase | ||
957 | assert_equal 20, assigns(:results)[:enterprises].total_entries | 957 | assert_equal 20, assigns(:results)[:enterprises].total_entries |
958 | end | 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 |