Download as
Browse Code »

Commit f8bd2430f86b0b6e3640e2662d1ca689a46ecb98

Authored by Joenio Costa
1 parent ad64d894
Exists in master and in 8 other branches cherry-pick-62193d8b, federation, gemfile-changes, rails4, rails5, stable-1.2, stable-1.3, stable-1.5

putting back all references to People, Member and Friends blocks 

the PeopleBlock plugin that comes with these blocks is enabled by
default in any Noosfero's environment

(ActionItem2859)
Showing 9 changed files with 33 additions and 5 deletions   Show diff stats
app/controllers/admin/environment_design_controller.rb
  Diff comments   View file @f8bd243
... ... @@ -5,7 +5,7 @@ class EnvironmentDesignController < BoxOrganizerController
5 5 def available_blocks
6 6 # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
7 7 # the Noosfero core soon, see ActionItem3045
8   - @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
  8 + @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
9 9 @available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
10 10 end
11 11  
... ...
app/controllers/my_profile/profile_design_controller.rb
  Diff comments   View file @f8bd243
... ... @@ -9,8 +9,14 @@ class ProfileDesignController < BoxOrganizerController
9 9  
10 10 blocks += plugins.dispatch(:extra_blocks)
11 11  
  12 + # blocks exclusive for organizations
  13 + if profile.has_members?
  14 + blocks << MembersBlock
  15 + end
  16 +
12 17 # blocks exclusive to people
13 18 if profile.person?
  19 + blocks << FriendsBlock
14 20 blocks << FavoriteEnterprisesBlock
15 21 blocks << CommunitiesBlock
16 22 blocks << EnterprisesBlock
... ...
app/models/box.rb
  Diff comments   View file @f8bd243
... ... @@ -34,11 +34,14 @@ class Box &lt; ActiveRecord::Base
34 34 FansBlock,
35 35 FavoriteEnterprisesBlock,
36 36 FeedReaderBlock,
  37 + FriendsBlock,
37 38 HighlightsBlock,
38 39 LinkListBlock,
39 40 LoginBlock,
40 41 MainBlock,
  42 + MembersBlock,
41 43 MyNetworkBlock,
  44 + PeopleBlock,
42 45 ProfileImageBlock,
43 46 RawHTMLBlock,
44 47 RecentDocumentsBlock,
... ... @@ -60,11 +63,14 @@ class Box &lt; ActiveRecord::Base
60 63 FavoriteEnterprisesBlock,
61 64 FeaturedProductsBlock,
62 65 FeedReaderBlock,
  66 + FriendsBlock,
63 67 HighlightsBlock,
64 68 LinkListBlock,
65 69 LocationBlock,
66 70 LoginBlock,
  71 + MembersBlock,
67 72 MyNetworkBlock,
  73 + PeopleBlock,
68 74 ProductsBlock,
69 75 ProductCategoriesBlock,
70 76 ProfileImageBlock,
... ...
app/models/community.rb
  Diff comments   View file @f8bd243
... ... @@ -85,6 +85,10 @@ class Community &lt; Organization
85 85 recent_documents(limit, ["articles.type != ? AND articles.highlighted = ?", 'Folder', highlight])
86 86 end
87 87  
  88 + def blocks_to_expire_cache
  89 + [MembersBlock]
  90 + end
  91 +
88 92 def each_member(offset=0)
89 93 while member = self.members.first(:order => :id, :offset => offset)
90 94 yield member
... ...
app/models/environment.rb
  Diff comments   View file @f8bd243
... ... @@ -182,6 +182,7 @@ class Environment &lt; ActiveRecord::Base
182 182  
183 183 # "right" area
184 184 env.boxes[2].blocks << CommunitiesBlock.new(:limit => 6)
  185 + env.boxes[2].blocks << PeopleBlock.new(:limit => 6)
185 186 end
186 187  
187 188 # One Environment can be reached by many domains
... ...
app/models/organization.rb
  Diff comments   View file @f8bd243
... ... @@ -123,7 +123,7 @@ class Organization &lt; Profile
123 123 [
124 124 [MainBlock.new],
125 125 [ProfileImageBlock.new, LinkListBlock.new(:links => links)],
126   - [RecentDocumentsBlock.new]
  126 + [MembersBlock.new, RecentDocumentsBlock.new]
127 127 ]
128 128 end
129 129  
... ...
app/models/person.rb
  Diff comments   View file @f8bd243
... ... @@ -269,7 +269,7 @@ class Person &lt; Profile
269 269 [
270 270 [MainBlock.new],
271 271 [ProfileImageBlock.new(:show_name => true), LinkListBlock.new(:links => links), RecentDocumentsBlock.new],
272   - [CommunitiesBlock.new]
  272 + [FriendsBlock.new, CommunitiesBlock.new]
273 273 ]
274 274 end
275 275  
... ...
test/functional/environment_design_controller_test.rb
  Diff comments   View file @f8bd243
... ... @@ -8,7 +8,7 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
8 8  
9 9 # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
10 10 # the Noosfero core soon, see ActionItem3045
11   - ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
  11 + ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
12 12  
13 13 def setup
14 14 @controller = EnvironmentDesignController.new
... ... @@ -107,6 +107,16 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
107 107 assert_tag :tag => 'input', :attributes => { :id => 'block_limit' }
108 108 end
109 109  
  110 + should 'be able to edit PeopleBlock' do
  111 + login_as(create_admin_user(Environment.default))
  112 + b = PeopleBlock.create!
  113 + e = Environment.default
  114 + e.boxes.create!
  115 + e.boxes.first.blocks << b
  116 + get :edit, :id => b.id
  117 + assert_tag :tag => 'input', :attributes => { :id => 'block_limit' }
  118 + end
  119 +
110 120 should 'be able to edit SlideshowBlock' do
111 121 login_as(create_admin_user(Environment.default))
112 122 b = SlideshowBlock.create!
... ...
test/functional/profile_design_controller_test.rb
  Diff comments   View file @f8bd243
... ... @@ -6,7 +6,8 @@ class ProfileDesignController; def rescue_action(e) raise e end; end
6 6 class ProfileDesignControllerTest < ActionController::TestCase
7 7  
8 8 COMMOM_BLOCKS = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock, HighlightsBlock ]
9   - PERSON_BLOCKS = COMMOM_BLOCKS + [ FavoriteEnterprisesBlock, CommunitiesBlock, EnterprisesBlock ]
  9 + PERSON_BLOCKS = COMMOM_BLOCKS + [FriendsBlock, FavoriteEnterprisesBlock, CommunitiesBlock, EnterprisesBlock ]
  10 + PERSON_BLOCKS_WITH_MEMBERS = PERSON_BLOCKS + [MembersBlock]
10 11 PERSON_BLOCKS_WITH_BLOG = PERSON_BLOCKS + [BlogArchivesBlock]
11 12  
12 13 ENTERPRISE_BLOCKS = COMMOM_BLOCKS + [DisabledEnterpriseMessageBlock, FeaturedProductsBlock, FansBlock, ProductCategoriesBlock]
... ...