diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb index b446ed1..0453784 100644 --- a/app/controllers/public/search_controller.rb +++ b/app/controllers/public/search_controller.rb @@ -29,12 +29,11 @@ class SearchController < PublicController end def articles - @filter = params[:filter] ? filter : nil - @filter_title = params[:filter] ? filter_description(@asset, @filter) : nil if !@empty_query full_text_search ['public:true'] - elsif params[:filter] + else @results[@asset] = @environment.articles.public.send(@filter).paginate(paginate_options) + facets = {} end end @@ -54,6 +53,9 @@ class SearchController < PublicController def products if !@empty_query full_text_search ['public:true'] + else + @results[@asset] = @environment.products.send(@filter).paginate(paginate_options) + @facets = {} end end @@ -238,6 +240,7 @@ class SearchController < PublicController 'communities_more_recent' => _('More recent communities from network'), 'communities_more_active' => _('More active communities from network'), 'communities_more_popular' => _('More popular communities from network'), + 'products_more_recent' => _('More recent products from network'), }[asset.to_s + '_' + filter] end diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 2300890..b2494f1 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -124,7 +124,7 @@ module SearchHelper def order_by(asset) options = { - :products => [[_('Relevance'), ''], [_('Name'), 'name_or_category_sort asc'], [_('Lower price'), 'price_sort asc'], [_('Higher price'), 'price_sort desc']], + :products => [[_('Relevance'), ''], [_('More Recent'), 'updated_at desc'], [_('Name'), 'name_or_category_sort asc'], [_('Lower price'), 'price_sort asc'], [_('Higher price'), 'price_sort desc']], :events => [[_('Relevance'), ''], [_('Name'), 'name_sort asc']], :articles => [[_('Relevance'), ''], [_('Name'), 'name_sort asc'], [_('Most recent'), 'updated_at desc']], :enterprises => [[_('Relevance'), ''], [_('Name'), 'name_sort asc']], -- libgit2 0.21.2