Commit 67bb5c90e29b1612dca4c7ed90586916369346c2

Authored by AntonioTerceiro
1 parent 3473b087

ActionItem154: making integration test pass: /tag/* routes have precedence over /search/* ones.



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1196 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
config/routes.rb
@@ -29,6 +29,10 @@ ActionController::Routing::Routes.draw do |map| @@ -29,6 +29,10 @@ ActionController::Routing::Routes.draw do |map|
29 # enterprise registration 29 # enterprise registration
30 map.connect 'enterprise_registration/:action', :controller => 'enterprise_registration' 30 map.connect 'enterprise_registration/:action', :controller => 'enterprise_registration'
31 31
  32 + # tags
  33 + map.tag 'tag', :controller => 'search', :action => 'tags'
  34 + map.tag 'tag/:tag', :controller => 'search', :action => 'tag'
  35 +
32 # search 36 # search
33 map.connect 'search/:action', :controller => 'search' 37 map.connect 'search/:action', :controller => 'search'
34 38
@@ -36,10 +40,6 @@ ActionController::Routing::Routes.draw do |map| @@ -36,10 +40,6 @@ ActionController::Routing::Routes.draw do |map|
36 map.connect 'cat', :controller => 'category', :action => 'index' 40 map.connect 'cat', :controller => 'category', :action => 'index'
37 map.category 'cat/*path', :controller => 'category', :action => 'view' 41 map.category 'cat/*path', :controller => 'category', :action => 'view'
38 42
39 - # tags  
40 - map.tag 'tag', :controller => 'search', :action => 'tags'  
41 - map.tag 'tag/:tag', :controller => 'search', :action => 'tag'  
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
45 45