Download as
Browse Code »

Commit bbad555fdd3f427119f697f035ce8984113ba34a

Authored by Rodrigo Souto
1 parent 16c36447
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

[search-improvements] Use only enabled assets 

Also removing events from assets list since it has no search (yet).
Showing 2 changed files with 23 additions and 14 deletions   Show diff stats
app/controllers/public/search_controller.rb
  Diff comments   View file @bbad555
... ... @@ -173,13 +173,21 @@ class SearchController < PublicController
173 173 end
174 174 end
175 175  
  176 + AVAILABLE_SEARCHES = ActiveSupport::OrderedHash[
  177 + :articles, _('Contents'),
  178 + :enterprises, _('Enterprises'),
  179 + :people, _('People'),
  180 + :communities, _('Communities'),
  181 + :products, _('Products and Services'),
  182 + ]
  183 +
176 184 def load_search_assets
177   - if SEARCHES.keys.include?(params[:action].to_sym) && environment.enabled?("disable_asset_#{params[:action]}")
  185 + if AVAILABLE_SEARCHES.keys.include?(params[:action].to_sym) && environment.enabled?("disable_asset_#{params[:action]}")
178 186 render_not_found
179 187 return
180 188 end
181 189  
182   - @enabled_searches = SEARCHES.select {|key, name| environment.disabled?("disable_asset_#{key}") }
  190 + @enabled_searches = AVAILABLE_SEARCHES.select {|key, name| environment.disabled?("disable_asset_#{key}") }
183 191 @searching = {}
184 192 @titles = {}
185 193 @enabled_searches.each do |key, name|
... ... @@ -191,7 +199,7 @@ class SearchController < PublicController
191 199  
192 200 def load_order
193 201 @order = 'more_recent'
194   - if SEARCHES.keys.include?(@asset.to_sym)
  202 + if AVAILABLE_SEARCHES.keys.include?(@asset.to_sym)
195 203 available_orders = asset_class(@asset)::SEARCH_FILTERS[:order]
196 204 @order = params[:order] if available_orders.include?(params[:order])
197 205 end
... ... @@ -232,4 +240,14 @@ class SearchController < PublicController
232 240 20
233 241 end
234 242  
  243 + def available_assets
  244 + assets = ActiveSupport::OrderedHash[
  245 + :articles, _('Contents'),
  246 + :enterprises, _('Enterprises'),
  247 + :people, _('People'),
  248 + :communities, _('Communities'),
  249 + :products, _('Products and Services'),
  250 + ]
  251 + end
  252 +
235 253 end
... ...
app/helpers/search_helper.rb
  Diff comments   View file @bbad555
... ... @@ -5,15 +5,6 @@ module SearchHelper
5 5 BLOCKS_SEARCH_LIMIT = 24
6 6 MULTIPLE_SEARCH_LIMIT = 8
7 7  
8   - SEARCHES = ActiveSupport::OrderedHash[
9   - :articles, _('Contents'),
10   - :enterprises, _('Enterprises'),
11   - :people, _('People'),
12   - :communities, _('Communities'),
13   - :products, _('Products and Services'),
14   - :events, _('Events'),
15   - ]
16   -
17 8 FILTERS_TRANSLATIONS = {
18 9 :order => _('Order'),
19 10 :display => _('Display')
... ... @@ -118,7 +109,7 @@ module SearchHelper
118 109 end
119 110  
120 111 def assets_menu(selected)
121   - assets = SEARCHES.keys
  112 + assets = @enabled_searches.keys
122 113 content_tag('ul',
123 114 assets.map do |asset|
124 115 options = {}
... ... @@ -129,7 +120,7 @@ module SearchHelper
129 120 end
130 121  
131 122 def asset_link(asset)
132   - link_to(SEARCHES[asset], "/search/#{asset}")
  123 + link_to(@enabled_searches[asset], "/search/#{asset}")
133 124 end
134 125  
135 126 end
... ...