Download as
Browse Code »

Commit 194e82123933fea0ec16ba786b74988856a0a55c

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

ActionItem36: adding a friends block 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1506 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 61 additions and 0 deletions   Show diff stats
app/controllers/my_profile/profile_design_controller.rb
  Diff comments   View file @194e821
@@ -5,10 +5,15 @@ class ProfileDesignController < BoxOrganizerController @@ -5,10 +5,15 @@ class ProfileDesignController < BoxOrganizerController
5 def available_blocks 5 def available_blocks
6 blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock ] 6 blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock ]
7 7
  8 + # blocks exclusive for organizations
8 if profile.has_members? 9 if profile.has_members?
9 blocks << MembersBlock 10 blocks << MembersBlock
10 end 11 end
11 12
  13 + if profile.person?
  14 + blocks << FriendsBlock
  15 + end
  16 +
12 blocks 17 blocks
13 end 18 end
14 19
app/models/friends_block.rb 0 → 100644
  Diff comments   View file @194e821
@@ -0,0 +1,22 @@ @@ -0,0 +1,22 @@
  1 +class FriendsBlock < ProfileListBlock
  2 +
  3 + def self.description
  4 + _('A block that displays your friends')
  5 + end
  6 +
  7 + def title
  8 + _('Friends')
  9 + end
  10 +
  11 + class FriendsBlock::Finder < ProfileListBlock::Finder
  12 + def ids
  13 + self.block.owner.friend_ids
  14 + end
  15 + end
  16 +
  17 + def profile_finder
  18 + @profile_finder ||= FriendsBlock::Finder.new(self)
  19 + end
  20 +
  21 +
  22 +end
test/unit/friends_block_test.rb 0 → 100644
  Diff comments   View file @194e821
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
  1 +require File.dirname(__FILE__) + '/../test_helper'
  2 +
  3 +class FriendsBlockTest < ActiveSupport::TestCase
  4 +
  5 + should 'describe itself' do
  6 + assert_not_equal ProfileListBlock.description, FriendsBlock.description
  7 + end
  8 +
  9 + should 'declare its title' do
  10 + assert_not_equal ProfileListBlock.new.title, FriendsBlock.new.title
  11 + end
  12 +
  13 + should 'use its own finder' do
  14 + assert_not_equal ProfileListBlock::Finder, FriendsBlock::Finder
  15 + assert_kind_of FriendsBlock::Finder, FriendsBlock.new.profile_finder
  16 + end
  17 +
  18 + should 'list owner friends' do
  19 + p1 = create_user('testuser1').person
  20 + p2 = create_user('testuser2').person
  21 + p3 = create_user('testuser3').person
  22 + p4 = create_user('testuser4').person
  23 +
  24 + p1.add_friend(p2)
  25 + p1.add_friend(p3)
  26 + p1.add_friend(p4)
  27 +
  28 + block = FriendsBlock.new
  29 + block.expects(:owner).returns(p1)
  30 +
  31 + assert_equivalent [p2, p3, p4], block.profiles
  32 + end
  33 +
  34 +end