Download as
Browse Code »

Commit 36eefde0405cef572046d293b05efeec82db2591

Authored by Antonio Terceiro
1 parent e09c2fa4
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

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,10 +84,10 @@ ActionController::Routing::Routes.draw do |map|
84 # cache stuff - hack 84 # cache stuff - hack
85 map.cache 'public/:action/:id', :controller => 'public' 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 end 93 end