Download as
Browse Code »

Commit ed6f25a584d060330894dad331d62660ce99a99b

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

ActionItem43: allowing override of the title 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1348 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 10 additions and 5 deletions   Show diff stats
app/models/profile_list_block.rb
  Diff comments   View file @ed6f25a
@@ -37,10 +37,16 @@ class ProfileListBlock < Block @@ -37,10 +37,16 @@ class ProfileListBlock < Block
37 Kernel.rand(top) 37 Kernel.rand(top)
38 end 38 end
39 39
  40 + # the title of the block. Probably will be overriden in subclasses.
  41 + def title
  42 + _('People and Groups')
  43 + end
  44 +
40 def content 45 def content
41 profiles = self.profiles 46 profiles = self.profiles
  47 + title = self.title
42 lambda do 48 lambda do
43 - block_title(_('People and Groups')) + 49 + block_title(title) +
44 profiles.map {|item| content_tag('div', profile_image_link(item)) }.join("\n") 50 profiles.map {|item| content_tag('div', profile_image_link(item)) }.join("\n")
45 end 51 end
46 end 52 end
test/unit/profile_list_block_test.rb
  Diff comments   View file @ed6f25a
@@ -34,7 +34,6 @@ class ProfileListBlockTest < Test::Unit::TestCase @@ -34,7 +34,6 @@ class ProfileListBlockTest < Test::Unit::TestCase
34 self.expects(:profile_image_link).with(person3).once 34 self.expects(:profile_image_link).with(person3).once
35 35
36 self.expects(:content_tag).returns('<div></div>').at_least_once 36 self.expects(:content_tag).returns('<div></div>').at_least_once
37 - self.expects(:_).returns('text').at_least_once  
38 self.expects(:block_title).returns('block title').at_least_once 37 self.expects(:block_title).returns('block title').at_least_once
39 38
40 assert_kind_of String, instance_eval(&block.content) 39 assert_kind_of String, instance_eval(&block.content)
@@ -53,9 +52,9 @@ class ProfileListBlockTest &lt; Test::Unit::TestCase @@ -53,9 +52,9 @@ class ProfileListBlockTest &lt; Test::Unit::TestCase
53 52
54 should 'support non-class finders' do 53 should 'support non-class finders' do
55 block = ProfileListBlock.new 54 block = ProfileListBlock.new
56 - profile = create_user('mytestuser').person  
57 - block.expects(:profile_finder).returns(profile.members).once  
58 - profile.members.expects(:find).with(is_a(Hash)).once 55 + finder = mock
  56 + block.expects(:profile_finder).returns(finder).once
  57 + finder.expects(:find).with(is_a(Hash)).once
59 block.profiles 58 block.profiles
60 end 59 end
61 60