Download as
Browse Code »

Commit b37c7bda5b88e7a20e2ca6d891069fa1ae6c0a82

Authored by Daniela Feitosa
1 parent 28328daa
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

Changed blocks footer to link to browse 

On people and communities blocks

(ActionItem1792)
Showing 4 changed files with 5 additions and 5 deletions   Show diff stats
app/models/communities_block.rb
  Diff comments   View file @b37c7bd
@@ -21,7 +21,7 @@ class CommunitiesBlock < ProfileListBlock @@ -21,7 +21,7 @@ class CommunitiesBlock < ProfileListBlock
21 end 21 end
22 when Environment 22 when Environment
23 lambda do 23 lambda do
24 - link_to s_('communities|View all'), :controller => 'search', :action => 'assets', :asset => 'communities' 24 + link_to s_('communities|View all'), :controller => 'browse', :action => 'communities'
25 end 25 end
26 else 26 else
27 '' 27 ''
app/models/people_block.rb
  Diff comments   View file @b37c7bd
@@ -18,7 +18,7 @@ class PeopleBlock < ProfileListBlock @@ -18,7 +18,7 @@ class PeopleBlock < ProfileListBlock
18 18
19 def footer 19 def footer
20 lambda do 20 lambda do
21 - link_to _('View all'), :controller => 'search', :action => 'assets', :asset => 'people' 21 + link_to _('View all'), :controller => 'browse', :action => 'people'
22 end 22 end
23 end 23 end
24 24
test/unit/communities_block_test.rb
  Diff comments   View file @b37c7bd
@@ -43,7 +43,7 @@ class CommunitiesBlockTest < Test::Unit::TestCase @@ -43,7 +43,7 @@ class CommunitiesBlockTest < Test::Unit::TestCase
43 block = CommunitiesBlock.new 43 block = CommunitiesBlock.new
44 block.expects(:owner).returns(env) 44 block.expects(:owner).returns(env)
45 45
46 - expects(:link_to).with('View all', :controller => 'search', :action => 'assets', :asset => 'communities') 46 + expects(:link_to).with('View all', :controller => "browse", :action => 'communities')
47 47
48 instance_eval(&block.footer) 48 instance_eval(&block.footer)
49 end 49 end
test/unit/people_block_test.rb
  Diff comments   View file @b37c7bd
@@ -35,12 +35,12 @@ class PeopleBlockTest < ActiveSupport::TestCase @@ -35,12 +35,12 @@ class PeopleBlockTest < ActiveSupport::TestCase
35 assert_match(/#{person2.name}/, content) 35 assert_match(/#{person2.name}/, content)
36 end 36 end
37 37
38 - should 'link to people directory' do 38 + should 'link to browse people' do
39 block = PeopleBlock.new 39 block = PeopleBlock.new
40 block.stubs(:owner).returns(Environment.default) 40 block.stubs(:owner).returns(Environment.default)
41 41
42 expects(:_).with('View all').returns('View all people') 42 expects(:_).with('View all').returns('View all people')
43 - expects(:link_to).with('View all people', :controller => 'search', :action => 'assets', :asset => 'people') 43 + expects(:link_to).with('View all people', :controller => 'browse', :action => 'people')
44 instance_eval(&block.footer) 44 instance_eval(&block.footer)
45 end 45 end
46 46