From 9ceae77bcdbf548cbde2666a03635fcbcb37e71a Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Tue, 1 Jul 2014 12:32:10 -0300 Subject: [PATCH] [search-improvements] Use only enabled assets --- app/controllers/public/search_controller.rb | 25 ++++++++++++++++++++++--- app/helpers/search_helper.rb | 13 ++----------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb index 9235704..5991c64 100644 --- a/app/controllers/public/search_controller.rb +++ b/app/controllers/public/search_controller.rb @@ -173,13 +173,22 @@ class SearchController < PublicController end end + AVAILABLE_SEARCHES = ActiveSupport::OrderedHash[ + :articles, _('Contents'), + :enterprises, _('Enterprises'), + :people, _('People'), + :communities, _('Communities'), + :products, _('Products and Services'), + :events, _('Events'), + ] + def load_search_assets - if SEARCHES.keys.include?(params[:action].to_sym) && environment.enabled?("disable_asset_#{params[:action]}") + if AVAILABLE_SEARCHES.keys.include?(params[:action].to_sym) && environment.enabled?("disable_asset_#{params[:action]}") render_not_found return end - @enabled_searches = SEARCHES.select {|key, name| environment.disabled?("disable_asset_#{key}") } + @enabled_searches = AVAILABLE_SEARCHES.select {|key, name| environment.disabled?("disable_asset_#{key}") } @searching = {} @titles = {} @enabled_searches.each do |key, name| @@ -191,7 +200,7 @@ class SearchController < PublicController def load_order @order = 'more_recent' - if SEARCHES.keys.include?(@asset.to_sym) + if AVAILABLE_SEARCHES.keys.include?(@asset.to_sym) available_orders = asset_class(@asset)::SEARCH_FILTERS[:order] @order = params[:order] if available_orders.include?(params[:order]) end @@ -232,4 +241,14 @@ class SearchController < PublicController 20 end + def available_assets + assets = ActiveSupport::OrderedHash[ + :articles, _('Contents'), + :enterprises, _('Enterprises'), + :people, _('People'), + :communities, _('Communities'), + :products, _('Products and Services'), + ] + end + end diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 802cfad..aaea83a 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -5,15 +5,6 @@ module SearchHelper BLOCKS_SEARCH_LIMIT = 24 MULTIPLE_SEARCH_LIMIT = 8 - SEARCHES = ActiveSupport::OrderedHash[ - :articles, _('Contents'), - :enterprises, _('Enterprises'), - :people, _('People'), - :communities, _('Communities'), - :products, _('Products and Services'), - :events, _('Events'), - ] - FILTERS_TRANSLATIONS = { :order => _('Order'), :display => _('Display') @@ -118,7 +109,7 @@ module SearchHelper end def assets_menu(selected) - assets = SEARCHES.keys + assets = @enabled_searches.keys content_tag('ul', assets.map do |asset| options = {} @@ -129,7 +120,7 @@ module SearchHelper end def asset_link(asset) - link_to(SEARCHES[asset], "/search/#{asset}") + link_to(@enabled_searches[asset], "/search/#{asset}") end end -- libgit2 0.21.2