Download as
Browse Code »

Commit 8c3936e60e0b168efe191b8495c4b20af80ebbc3

Authored by AntonioTerceiro
1 parent 09a87726
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

ActionItem8: unknown domains defaults to VirtualCommunity.default 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@26 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 18 additions and 2 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @8c3936e
@@ -8,8 +8,12 @@ class ApplicationController < ActionController::Base @@ -8,8 +8,12 @@ class ApplicationController < ActionController::Base
8 8
9 def detect_stuff_by_domain 9 def detect_stuff_by_domain
10 @domain = Domain.find_by_name(request.host) 10 @domain = Domain.find_by_name(request.host)
11 - @virtual_community = @domain.virtual_community  
12 - @profile = @domain.profile 11 + if @domain.nil?
  12 + @virtual_community = VirtualCommunity.default
  13 + else
  14 + @virtual_community = @domain.virtual_community
  15 + @profile = @domain.profile
  16 + end
13 end 17 end
14 18
15 end 19 end
test/functional/home_controller_test.rb
  Diff comments   View file @8c3936e
@@ -39,4 +39,16 @@ class HomeControllerTest < Test::Unit::TestCase @@ -39,4 +39,16 @@ class HomeControllerTest < Test::Unit::TestCase
39 39
40 assert_kind_of Profile, assigns(:profile) 40 assert_kind_of Profile, assigns(:profile)
41 end 41 end
  42 +
  43 + def test_unknown_domain_falls_back_to_default_virtual_community
  44 + uses_host 'veryunprobabledomain.com'
  45 +
  46 + get :index
  47 + assert_template 'index'
  48 +
  49 + assert_kind_of VirtualCommunity, assigns(:virtual_community)
  50 + assert assigns(:virtual_community).is_default?
  51 +
  52 + end
  53 +
42 end 54 end