Download as
Browse Code »

Commit 6833d6b2ba3814d0524f7e5d4375cfaab50d4122

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

ActionItem31: index action to display a tag cloud and view for displaying a specific tag 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1015 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 4 additions and 2 deletions   Show diff stats
config/routes.rb
  Diff comments   View file @6833d6b
@@ -37,7 +37,8 @@ ActionController::Routing::Routes.draw do |map| @@ -37,7 +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/:tag', :controller => 'tag', :action => 'index' 40 + map.tag 'tag', :controller => 'tag', :action => 'index'
  41 + map.tag 'tag/:tag', :controller => 'tag', :action => 'view'
41 42
42 # controllers for blocks 43 # controllers for blocks
43 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 @6833d6b
@@ -90,7 +90,8 @@ class RoutingTest < ActionController::IntegrationTest @@ -90,7 +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/umboraminhaporra', :controller => 'tag', :action => 'index', :tag => 'umboraminhaporra') 93 + assert_routing('/tag', :controller => 'tag', :action => 'index')
  94 + assert_routing('/tag/umboraminhaporra', :controller => 'tag', :action => 'view', :tag => 'umboraminhaporra')
94 end 95 end
95 96
96 end 97 end