Commit f50ca7fd7a5451963394496b40abf8a84fbaec28
1 parent
e6ca4fb7
Exists in
staging
and in
42 other branches
removing blocks from core
Showing
3 changed files
with
0 additions
and
140 deletions
Show diff stats
app/models/friends_block.rb
| @@ -1,26 +0,0 @@ | @@ -1,26 +0,0 @@ | ||
| 1 | -class FriendsBlock < ProfileListBlock | ||
| 2 | - | ||
| 3 | - def self.description | ||
| 4 | - _('Friends') | ||
| 5 | - end | ||
| 6 | - | ||
| 7 | - def default_title | ||
| 8 | - n_('{#} friend', '{#} friends', profile_count) | ||
| 9 | - end | ||
| 10 | - | ||
| 11 | - def help | ||
| 12 | - _('This block displays your friends.') | ||
| 13 | - end | ||
| 14 | - | ||
| 15 | - def footer | ||
| 16 | - owner_id = owner.identifier | ||
| 17 | - proc do | ||
| 18 | - link_to s_('friends|View all'), :profile => owner_id, :controller => 'profile', :action => 'friends' | ||
| 19 | - end | ||
| 20 | - end | ||
| 21 | - | ||
| 22 | - def profiles | ||
| 23 | - owner.friends | ||
| 24 | - end | ||
| 25 | - | ||
| 26 | -end |
app/models/members_block.rb
| @@ -1,52 +0,0 @@ | @@ -1,52 +0,0 @@ | ||
| 1 | -class MembersBlock < ProfileListBlock | ||
| 2 | - settings_items :show_join_leave_button, :type => :boolean, :default => false | ||
| 3 | - | ||
| 4 | - attr_accessible :show_join_leave_button | ||
| 5 | - | ||
| 6 | - def self.description | ||
| 7 | - _('Members') | ||
| 8 | - end | ||
| 9 | - | ||
| 10 | - def default_title | ||
| 11 | - _('{#} members') | ||
| 12 | - end | ||
| 13 | - | ||
| 14 | - def help | ||
| 15 | - _('This block presents the members of a collective.') | ||
| 16 | - end | ||
| 17 | - | ||
| 18 | - def footer | ||
| 19 | - profile = self.owner | ||
| 20 | - s = show_join_leave_button | ||
| 21 | - | ||
| 22 | - proc do | ||
| 23 | - render :file => 'blocks/members', :locals => { :profile => profile, :show_join_leave_button => s} | ||
| 24 | - end | ||
| 25 | - end | ||
| 26 | - | ||
| 27 | - def profiles | ||
| 28 | - owner.members | ||
| 29 | - end | ||
| 30 | - | ||
| 31 | - def extra_option | ||
| 32 | - data = { | ||
| 33 | - :human_name => _("Show join leave button"), | ||
| 34 | - :name => 'block[show_join_leave_button]', | ||
| 35 | - :value => true, | ||
| 36 | - :checked => show_join_leave_button, | ||
| 37 | - :options => {} | ||
| 38 | - } | ||
| 39 | - end | ||
| 40 | - | ||
| 41 | - def cache_key(language='en', user=nil) | ||
| 42 | - logged = '' | ||
| 43 | - if user | ||
| 44 | - logged += '-logged-in' | ||
| 45 | - if user.is_member_of? self.owner | ||
| 46 | - logged += '-member' | ||
| 47 | - end | ||
| 48 | - end | ||
| 49 | - super + logged | ||
| 50 | - end | ||
| 51 | - | ||
| 52 | -end |
test/unit/members_block_test.rb
| @@ -1,62 +0,0 @@ | @@ -1,62 +0,0 @@ | ||
| 1 | -require File.dirname(__FILE__) + '/../test_helper' | ||
| 2 | - | ||
| 3 | -class MembersBlockTest < ActiveSupport::TestCase | ||
| 4 | - | ||
| 5 | - should 'inherit from ProfileListBlock' do | ||
| 6 | - assert_kind_of ProfileListBlock, MembersBlock.new | ||
| 7 | - end | ||
| 8 | - | ||
| 9 | - should 'describe itself' do | ||
| 10 | - assert_not_equal ProfileListBlock.description, MembersBlock.description | ||
| 11 | - end | ||
| 12 | - | ||
| 13 | - should 'provide a default title' do | ||
| 14 | - assert_not_equal ProfileListBlock.new.default_title, MembersBlock.new.default_title | ||
| 15 | - end | ||
| 16 | - | ||
| 17 | - should 'display members file' do | ||
| 18 | - community = fast_create(Community) | ||
| 19 | - block = MembersBlock.create | ||
| 20 | - block.expects(:owner).returns(community) | ||
| 21 | - | ||
| 22 | - self.expects(:render).with(:file => 'blocks/members', :locals => { :profile => community, :show_join_leave_button => false}).returns('file-with-members-list') | ||
| 23 | - assert_equal 'file-with-members-list', instance_eval(&block.footer) | ||
| 24 | - end | ||
| 25 | - | ||
| 26 | - should 'pick random members' do | ||
| 27 | - block = MembersBlock.new | ||
| 28 | - | ||
| 29 | - owner = mock | ||
| 30 | - block.expects(:owner).returns(owner) | ||
| 31 | - | ||
| 32 | - list = [] | ||
| 33 | - owner.expects(:members).returns(list) | ||
| 34 | - | ||
| 35 | - assert_same list, block.profiles | ||
| 36 | - end | ||
| 37 | - | ||
| 38 | - should 'use logged-in to compose cache key' do | ||
| 39 | - person = fast_create(Person) | ||
| 40 | - community = fast_create(Community) | ||
| 41 | - block = MembersBlock.create | ||
| 42 | - block.expects(:owner).returns(community) | ||
| 43 | - | ||
| 44 | - assert_match(/-logged-in/,block.cache_key('en', person)) | ||
| 45 | - end | ||
| 46 | - | ||
| 47 | - should 'use logged-in and member to compose cache key for members' do | ||
| 48 | - person = fast_create(Person) | ||
| 49 | - community = fast_create(Community) | ||
| 50 | - community.add_member person | ||
| 51 | - block = MembersBlock.create | ||
| 52 | - block.expects(:owner).returns(community) | ||
| 53 | - | ||
| 54 | - assert_match(/-logged-in-member/,block.cache_key('en', person)) | ||
| 55 | - end | ||
| 56 | - | ||
| 57 | - should 'not change block cache key if user is nil' do | ||
| 58 | - block = MembersBlock.new | ||
| 59 | - assert_equal block.cache_key('en'), block.cache_key('en', nil) | ||
| 60 | - end | ||
| 61 | - | ||
| 62 | -end |