[search-improvements] Use only enabled assets

Also removing events from assets list since it has no search (yet).

[search-improvements] Use only enabled assets
Also removing events from assets list since it has no search (yet).
Rodrigo Souto
1 parent 16c36447
Showing 2 changed files with 23 additions and 14 deletions Show diff stats
app/controllers/public/search_controller.rb
app/helpers/search_helper.rb
@@ -173,13 +173,21 @@ class SearchController &lt; PublicController
     end
   end
+  AVAILABLE_SEARCHES = ActiveSupport::OrderedHash[
+    :articles, _('Contents'),
+    :enterprises, _('Enterprises'),
+    :people, _('People'),
+    :communities, _('Communities'),
+    :products, _('Products and Services'),
+  ]
+
   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 +199,7 @@ class SearchController &lt; 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 +240,14 @@ class SearchController &lt; PublicController
     20
   end
+  def available_assets
+    assets = ActiveSupport::OrderedHash[
+      :articles, _('Contents'),
+      :enterprises, _('Enterprises'),
+      :people, _('People'),
+      :communities, _('Communities'),
+      :products, _('Products and Services'),
+    ]
+  end
+
 end
@@ -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