Download as
Browse Code »

Commit 67bb5c90e29b1612dca4c7ed90586916369346c2

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

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
  Diff comments   View file @67bb5c9
... ... @@ -29,6 +29,10 @@ ActionController::Routing::Routes.draw do |map|
29 29 # enterprise registration
30 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 36 # search
33 37 map.connect 'search/:action', :controller => 'search'
34 38  
... ... @@ -36,10 +40,6 @@ ActionController::Routing::Routes.draw do |map|
36 40 map.connect 'cat', :controller => 'category', :action => 'index'
37 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 43 # controllers for blocks
44 44 map.controllers 'block/:profile/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_from_design_blocks
45 45  
... ...