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