Download as
Browse Code »

Commit 17985317a0aa9ae3c7dbcc41f935f1b6cabc85bb

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

ActionItem31: putting tags in the search controller 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1023 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
config/routes.rb
  Diff comments   View file @1798531
@@ -37,8 +37,8 @@ ActionController::Routing::Routes.draw do |map| @@ -37,8 +37,8 @@ ActionController::Routing::Routes.draw do |map|
37 map.category 'cat/*path', :controller => 'category', :action => 'view' 37 map.category 'cat/*path', :controller => 'category', :action => 'view'
38 38
39 # tags 39 # tags
40 - map.tag 'tag', :controller => 'tag', :action => 'index'  
41 - map.tag 'tag/:tag', :controller => 'tag', :action => 'view' 40 + map.tag 'tag', :controller => 'search', :action => 'tags'
  41 + map.tag 'tag/:tag', :controller => 'search', :action => 'tag'
42 42
43 # controllers for blocks 43 # controllers for blocks
44 map.controllers 'block/:profile/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_from_design_blocks 44 map.controllers 'block/:profile/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_from_design_blocks
test/integration/routing_test.rb
  Diff comments   View file @1798531
@@ -90,8 +90,8 @@ class RoutingTest < ActionController::IntegrationTest @@ -90,8 +90,8 @@ class RoutingTest < ActionController::IntegrationTest
90 end 90 end
91 91
92 def test_tag_viewing 92 def test_tag_viewing
93 - assert_routing('/tag', :controller => 'tag', :action => 'index')  
94 - assert_routing('/tag/umboraminhaporra', :controller => 'tag', :action => 'view', :tag => 'umboraminhaporra') 93 + assert_routing('/tag', :controller => 'search', :action => 'tags')
  94 + assert_routing('/tag/umboraminhaporra', :controller => 'search', :action => 'tag', :tag => 'umboraminhaporra')
95 end 95 end
96 96
97 end 97 end