Download as
Browse Code »

Commit 657084436e1a031727581d7b1b12fc06a93af67a

Authored by Rodrigo Souto
2 parents 81ca0e3a 3149f725
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

Merge commit 'refs/merge-requests/285' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/285
Showing 2 changed files with 23 additions and 0 deletions   Show diff stats
app/controllers/application_controller.rb
  Diff comments   View file @6570844
@@ -98,6 +98,12 @@ class ApplicationController < ActionController::Base @@ -98,6 +98,12 @@ class ApplicationController < ActionController::Base
98 else 98 else
99 @environment = @domain.environment 99 @environment = @domain.environment
100 @profile = @domain.profile 100 @profile = @domain.profile
  101 +
  102 + # Check if the requested profile belongs to another domain
  103 + if @profile && !params[:profile].blank? && params[:profile] != @profile.identifier
  104 + @profile = @environment.profiles.find_by_identifier params[:profile]
  105 + redirect_to params.merge(:host => @profile.default_hostname)
  106 + end
101 end 107 end
102 end 108 end
103 109
test/functional/profile_controller_test.rb
  Diff comments   View file @6570844
@@ -1218,6 +1218,23 @@ class ProfileControllerTest < ActionController::TestCase @@ -1218,6 +1218,23 @@ class ProfileControllerTest < ActionController::TestCase
1218 end 1218 end
1219 end 1219 end
1220 1220
  1221 + should 'check different profile from the domain profile' do
  1222 + default = Environment.default
  1223 + default.domains.create!(:name => 'environment.com')
  1224 + profile = create_user('another_user').person
  1225 + domain_profile = create_user('domain_user').person
  1226 + domain_profile.domains.create!(:name => 'profiledomain.com')
  1227 +
  1228 + @request.expects(:host).returns('profiledomain.com').at_least_once
  1229 + get :index, :profile => profile.identifier
  1230 + assert_response :redirect
  1231 + assert_redirected_to @request.params.merge(:host => profile.default_hostname)
  1232 +
  1233 + @request.expects(:host).returns(profile.default_hostname).at_least_once
  1234 + get :index, :profile => profile.identifier
  1235 + assert_response :success
  1236 + end
  1237 +
1221 should 'redirect to profile domain if it has one' do 1238 should 'redirect to profile domain if it has one' do
1222 community = fast_create(Community, :name => 'community with domain') 1239 community = fast_create(Community, :name => 'community with domain')
1223 community.domains << Domain.new(:name => 'community.example.net') 1240 community.domains << Domain.new(:name => 'community.example.net')