Download as
Browse Code »

Commit 36eefde0405cef572046d293b05efeec82db2591

Authored by Antonio Terceiro
1 parent e09c2fa4
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

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
... ...