Download as
Browse Code »

Commit c3d1e14e7bac9cac56706a783c48a1fe5010e85c

Authored by Joenio Costa
1 parent 2d804325
Exists in master and in 22 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, template_mirror_block, tests, tests_fixies

Revert "putting back all references to People, Member and Friends blocks" 

This reverts commit f8bd2430f86b0b6e3640e2662d1ca689a46ecb98.
Showing 9 changed files with 5 additions and 33 deletions   Show diff stats
app/controllers/admin/environment_design_controller.rb
  Diff comments   View file @c3d1e14
@@ -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, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ] 8 + @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, 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 @c3d1e14
@@ -9,14 +9,8 @@ class ProfileDesignController < BoxOrganizerController @@ -9,14 +9,8 @@ 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 -  
17 # blocks exclusive to people 12 # blocks exclusive to people
18 if profile.person? 13 if profile.person?
19 - blocks << FriendsBlock  
20 blocks << FavoriteEnterprisesBlock 14 blocks << FavoriteEnterprisesBlock
21 blocks << CommunitiesBlock 15 blocks << CommunitiesBlock
22 blocks << EnterprisesBlock 16 blocks << EnterprisesBlock
app/models/box.rb
  Diff comments   View file @c3d1e14
@@ -34,14 +34,11 @@ class Box &lt; ActiveRecord::Base @@ -34,14 +34,11 @@ class Box &lt; ActiveRecord::Base
34 FansBlock, 34 FansBlock,
35 FavoriteEnterprisesBlock, 35 FavoriteEnterprisesBlock,
36 FeedReaderBlock, 36 FeedReaderBlock,
37 - FriendsBlock,  
38 HighlightsBlock, 37 HighlightsBlock,
39 LinkListBlock, 38 LinkListBlock,
40 LoginBlock, 39 LoginBlock,
41 MainBlock, 40 MainBlock,
42 - MembersBlock,  
43 MyNetworkBlock, 41 MyNetworkBlock,
44 - PeopleBlock,  
45 ProfileImageBlock, 42 ProfileImageBlock,
46 RawHTMLBlock, 43 RawHTMLBlock,
47 RecentDocumentsBlock, 44 RecentDocumentsBlock,
@@ -63,14 +60,11 @@ class Box &lt; ActiveRecord::Base @@ -63,14 +60,11 @@ class Box &lt; ActiveRecord::Base
63 FavoriteEnterprisesBlock, 60 FavoriteEnterprisesBlock,
64 FeaturedProductsBlock, 61 FeaturedProductsBlock,
65 FeedReaderBlock, 62 FeedReaderBlock,
66 - FriendsBlock,  
67 HighlightsBlock, 63 HighlightsBlock,
68 LinkListBlock, 64 LinkListBlock,
69 LocationBlock, 65 LocationBlock,
70 LoginBlock, 66 LoginBlock,
71 - MembersBlock,  
72 MyNetworkBlock, 67 MyNetworkBlock,
73 - PeopleBlock,  
74 ProductsBlock, 68 ProductsBlock,
75 ProductCategoriesBlock, 69 ProductCategoriesBlock,
76 ProfileImageBlock, 70 ProfileImageBlock,
app/models/community.rb
  Diff comments   View file @c3d1e14
@@ -85,10 +85,6 @@ class Community &lt; Organization @@ -85,10 +85,6 @@ 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 -  
92 def each_member(offset=0) 88 def each_member(offset=0)
93 while member = self.members.first(:order => :id, :offset => offset) 89 while member = self.members.first(:order => :id, :offset => offset)
94 yield member 90 yield member
app/models/environment.rb
  Diff comments   View file @c3d1e14
@@ -182,7 +182,6 @@ class Environment &lt; ActiveRecord::Base @@ -182,7 +182,6 @@ 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)  
186 end 185 end
187 186
188 # One Environment can be reached by many domains 187 # One Environment can be reached by many domains
app/models/organization.rb
  Diff comments   View file @c3d1e14
@@ -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 - [MembersBlock.new, RecentDocumentsBlock.new] 126 + [RecentDocumentsBlock.new]
127 ] 127 ]
128 end 128 end
129 129
app/models/person.rb
  Diff comments   View file @c3d1e14
@@ -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 - [FriendsBlock.new, CommunitiesBlock.new] 272 + [CommunitiesBlock.new]
273 ] 273 ]
274 end 274 end
275 275
test/functional/environment_design_controller_test.rb
  Diff comments   View file @c3d1e14
@@ -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, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ] 11 + ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, 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,16 +107,6 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase @@ -107,16 +107,6 @@ 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 -  
120 should 'be able to edit SlideshowBlock' do 110 should 'be able to edit SlideshowBlock' do
121 login_as(create_admin_user(Environment.default)) 111 login_as(create_admin_user(Environment.default))
122 b = SlideshowBlock.create! 112 b = SlideshowBlock.create!
test/functional/profile_design_controller_test.rb
  Diff comments   View file @c3d1e14
@@ -6,8 +6,7 @@ class ProfileDesignController; def rescue_action(e) raise e end; end @@ -6,8 +6,7 @@ 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 + [FriendsBlock, FavoriteEnterprisesBlock, CommunitiesBlock, EnterprisesBlock ]  
10 - PERSON_BLOCKS_WITH_MEMBERS = PERSON_BLOCKS + [MembersBlock] 9 + PERSON_BLOCKS = COMMOM_BLOCKS + [ FavoriteEnterprisesBlock, CommunitiesBlock, EnterprisesBlock ]
11 PERSON_BLOCKS_WITH_BLOG = PERSON_BLOCKS + [BlogArchivesBlock] 10 PERSON_BLOCKS_WITH_BLOG = PERSON_BLOCKS + [BlogArchivesBlock]
12 11
13 ENTERPRISE_BLOCKS = COMMOM_BLOCKS + [DisabledEnterpriseMessageBlock, FeaturedProductsBlock, FansBlock, ProductCategoriesBlock] 12 ENTERPRISE_BLOCKS = COMMOM_BLOCKS + [DisabledEnterpriseMessageBlock, FeaturedProductsBlock, FansBlock, ProductCategoriesBlock]