Download as
Browse Code »

Commit ea278a0eb323733fac535f14f16afe9d590e99dc

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

ActionItem590: fix 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2330 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 10 additions and 2 deletions   Show diff stats
config/routes.rb
  Diff comments   View file @ea278a0
@@ -56,8 +56,8 @@ ActionController::Routing::Routes.draw do |map| @@ -56,8 +56,8 @@ ActionController::Routing::Routes.draw do |map|
56 ## Controllers that are profile-specific (for profile admins ) 56 ## Controllers that are profile-specific (for profile admins )
57 ###################################################### 57 ######################################################
58 # profile customization - "My profile" 58 # profile customization - "My profile"
59 - map.myprofile 'myprofile/:profile', :controller => 'profile_editor', :action => 'index'  
60 - map.myprofile 'myprofile/:profile/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_in_directory('my_profile') 59 + map.myprofile 'myprofile/:profile', :controller => 'profile_editor', :action => 'index', :profile => /#{Noosfero.identifier_format}/
  60 + map.myprofile 'myprofile/:profile/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_in_directory('my_profile'), :profile => /#{Noosfero.identifier_format}/
61 61
62 62
63 ###################################################### 63 ######################################################
test/integration/routing_test.rb
  Diff comments   View file @ea278a0
@@ -27,6 +27,10 @@ class RoutingTest < ActionController::IntegrationTest @@ -27,6 +27,10 @@ class RoutingTest < ActionController::IntegrationTest
27 assert_routing('/myprofile/ze/cms', :profile => 'ze', :controller => 'cms', :action => 'index') 27 assert_routing('/myprofile/ze/cms', :profile => 'ze', :controller => 'cms', :action => 'index')
28 end 28 end
29 29
  30 + def test_cms_when_identifier_has_a_dot
  31 + assert_routing('/myprofile/ynternet.org/cms', :profile => 'ynternet.org', :controller => 'cms', :action => 'index')
  32 + end
  33 +
30 def test_edit_template 34 def test_edit_template
31 # FIXME: this is wrong 35 # FIXME: this is wrong
32 assert_routing('/admin/edit_template', :controller => 'edit_template', :action => 'index') 36 assert_routing('/admin/edit_template', :controller => 'edit_template', :action => 'index')
@@ -36,6 +40,10 @@ class RoutingTest < ActionController::IntegrationTest @@ -36,6 +40,10 @@ class RoutingTest < ActionController::IntegrationTest
36 assert_routing('/myprofile/ze', :profile => 'ze', :controller => 'profile_editor', :action => 'index') 40 assert_routing('/myprofile/ze', :profile => 'ze', :controller => 'profile_editor', :action => 'index')
37 end 41 end
38 42
  43 + def test_profile_editor_when_identifier_has_a_dot
  44 + assert_routing('/myprofile/ynternet.org', :profile => 'ynternet.org', :controller => 'profile_editor', :action => 'index')
  45 + end
  46 +
39 # environment administrative controllers (admin/*) 47 # environment administrative controllers (admin/*)
40 ################################################################ 48 ################################################################
41 49