Download as
Browse Code »

Commit 4a74f898ec3b109e439548fa19ac33c00b872d31

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

ActionItem959: making it work for communities with their own domain

Showing 3 changed files with 11 additions and 1 deletions   Show diff stats
app/views/shared/join_community_popup.rhtml
  Diff comments   View file @4a74f89
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <% else %> 7 <% else %>
8 <%= button(:ok, _('Yes'), :controller => 'profile', :action => 'join', :profile => profile.identifier) %> 8 <%= button(:ok, _('Yes'), :controller => 'profile', :action => 'join', :profile => profile.identifier) %>
9 <% end %> 9 <% end %>
10 - <%= button_to_remote(:cancel, _('Not now'), :url => {:controller => 'profile', :action => 'refuse_for_now', :profile => profile.identifier}, :loaded => '$("join-community-popup").hide()') %> 10 + <%= button_to_remote(:cancel, _('Not now'), :url => profile.url.merge({:controller => 'profile', :action => 'refuse_for_now', :profile => profile.identifier}), :loaded => '$("join-community-popup").hide()') %>
11 <%= button(:cancel, _('No and don\'t ask again'), :controller => 'profile', :action => 'refuse_join', :profile => profile.identifier) if logged_in? %> 11 <%= button(:cancel, _('No and don\'t ask again'), :controller => 'profile', :action => 'refuse_join', :profile => profile.identifier) if logged_in? %>
12 <% end %> 12 <% end %>
13 </div> 13 </div>
config/routes.rb
  Diff comments   View file @4a74f89
@@ -20,6 +20,7 @@ ActionController::Routing::Routes.draw do |map| @@ -20,6 +20,7 @@ ActionController::Routing::Routes.draw do |map|
20 domain = Domain.find_by_name(env[:host]) 20 domain = Domain.find_by_name(env[:host])
21 domain && (domain.owner_type == 'Profile') 21 domain && (domain.owner_type == 'Profile')
22 end 22 end
  23 + map.connect 'profile/:profile/:action/:id', :controller => 'profile', :id => /.*/, :profile => /#{Noosfero.identifier_format}/, :conditions => { :if => hosted_domain_matcher }
23 map.connect '*page', :controller => 'content_viewer', :action => 'view_page', :conditions => { :if => hosted_domain_matcher } 24 map.connect '*page', :controller => 'content_viewer', :action => 'view_page', :conditions => { :if => hosted_domain_matcher }
24 25
25 map.connect 'test/:controller/:action/:id' , :controller => /.*test.*/ 26 map.connect 'test/:controller/:action/:id' , :controller => /.*test.*/
test/integration/routing_test.rb
  Diff comments   View file @4a74f89
@@ -174,6 +174,15 @@ class RoutingTest &lt; ActionController::IntegrationTest @@ -174,6 +174,15 @@ class RoutingTest &lt; ActionController::IntegrationTest
174 assert_routing('/work/free-software', :controller => 'content_viewer', :action => 'view_page', :page => [ 'work', 'free-software'] ) 174 assert_routing('/work/free-software', :controller => 'content_viewer', :action => 'view_page', :page => [ 'work', 'free-software'] )
175 end 175 end
176 176
  177 + def test_profile_under_hosted_domain
  178 + community = Community.create!(:identifier => 'testcomm', :name => "test community")
  179 + domain = Domain.create!(:name => 'example.com', :owner => community)
  180 +
  181 + ActionController::TestRequest.any_instance.expects(:host).returns('www.example.com')
  182 +
  183 + assert_routing('/profile/testcomm/refuse_for_now', :controller => 'profile', :action => 'refuse_for_now', :profile => 'testcomm')
  184 + end
  185 +
177 def test_must_not_route_as_profile_hosted_domain_for_domains_registered_for_environments 186 def test_must_not_route_as_profile_hosted_domain_for_domains_registered_for_environments
178 environment = Environment.default 187 environment = Environment.default
179 domain = Domain.create!(:name => 'example.com', :owner => environment) 188 domain = Domain.create!(:name => 'example.com', :owner => environment)