Download as
Browse Code »

Commit 36eefde0405cef572046d293b05efeec82db2591

Authored by Antonio Terceiro
1 parent e09c2fa4
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem1178: moving custom domain routing last 

Due to changes in the route recognization in Rails 2.1, the pure globbing
routes are always tested last, so the check for a hosted domain must be
done in the regular profile route.
Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
config/routes.rb
  Diff comments   View file @36eefde
... ... @@ -84,10 +84,10 @@ ActionController::Routing::Routes.draw do |map|
84 84 # cache stuff - hack
85 85 map.cache 'public/:action/:id', :controller => 'public'
86 86  
87   - # match requests for content in domains hosted for profiles
88   - map.connect '*page', :controller => 'content_viewer', :action => 'view_page', :conditions => { :if => lambda { |env| Domain.hosting_profile_at(env[:host])} }
  87 + # match requests for profiles that don't have a custom domain
  88 + map.homepage ':profile/*page', :controller => 'content_viewer', :action => 'view_page', :profile => /#{Noosfero.identifier_format}/, :conditions => { :if => lambda { |env| !Domain.hosting_profile_at(env[:host]) } }
89 89  
90   - # XXX this route must come last so other routes have priority over it.
91   - map.homepage ':profile/*page', :controller => 'content_viewer', :action => 'view_page', :profile => /#{Noosfero.identifier_format}/
  90 + # match requests for content in domains hosted for profiles
  91 + map.connect '*page', :controller => 'content_viewer', :action => 'view_page'
92 92  
93 93 end
... ...