Download as
Browse Code »

Commit c3d1e14e7bac9cac56706a783c48a1fe5010e85c

Authored by Joenio Costa
1 parent 2d804325
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, 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 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, 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 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 @c3d1e14
... ... @@ -9,14 +9,8 @@ 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   -
17 12 # blocks exclusive to people
18 13 if profile.person?
19   - blocks << FriendsBlock
20 14 blocks << FavoriteEnterprisesBlock
21 15 blocks << CommunitiesBlock
22 16 blocks << EnterprisesBlock
... ...
app/models/box.rb
  Diff comments   View file @c3d1e14
... ... @@ -34,14 +34,11 @@ class Box &lt; ActiveRecord::Base
34 34 FansBlock,
35 35 FavoriteEnterprisesBlock,
36 36 FeedReaderBlock,
37   - FriendsBlock,
38 37 HighlightsBlock,
39 38 LinkListBlock,
40 39 LoginBlock,
41 40 MainBlock,
42   - MembersBlock,
43 41 MyNetworkBlock,
44   - PeopleBlock,
45 42 ProfileImageBlock,
46 43 RawHTMLBlock,
47 44 RecentDocumentsBlock,
... ... @@ -63,14 +60,11 @@ class Box &lt; ActiveRecord::Base
63 60 FavoriteEnterprisesBlock,
64 61 FeaturedProductsBlock,
65 62 FeedReaderBlock,
66   - FriendsBlock,
67 63 HighlightsBlock,
68 64 LinkListBlock,
69 65 LocationBlock,
70 66 LoginBlock,
71   - MembersBlock,
72 67 MyNetworkBlock,
73   - PeopleBlock,
74 68 ProductsBlock,
75 69 ProductCategoriesBlock,
76 70 ProfileImageBlock,
... ...
app/models/community.rb
  Diff comments   View file @c3d1e14
... ... @@ -85,10 +85,6 @@ 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   -
92 88 def each_member(offset=0)
93 89 while member = self.members.first(:order => :id, :offset => offset)
94 90 yield member
... ...
app/models/environment.rb
  Diff comments   View file @c3d1e14
... ... @@ -182,7 +182,6 @@ 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)
186 185 end
187 186  
188 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 123 [
124 124 [MainBlock.new],
125 125 [ProfileImageBlock.new, LinkListBlock.new(:links => links)],
126   - [MembersBlock.new, RecentDocumentsBlock.new]
  126 + [RecentDocumentsBlock.new]
127 127 ]
128 128 end
129 129  
... ...
app/models/person.rb
  Diff comments   View file @c3d1e14
... ... @@ -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   - [FriendsBlock.new, CommunitiesBlock.new]
  272 + [CommunitiesBlock.new]
273 273 ]
274 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 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, 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 13 def setup
14 14 @controller = EnvironmentDesignController.new
... ... @@ -107,16 +107,6 @@ 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   -
120 110 should 'be able to edit SlideshowBlock' do
121 111 login_as(create_admin_user(Environment.default))
122 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 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 + [FriendsBlock, FavoriteEnterprisesBlock, CommunitiesBlock, EnterprisesBlock ]
10   - PERSON_BLOCKS_WITH_MEMBERS = PERSON_BLOCKS + [MembersBlock]
  9 + PERSON_BLOCKS = COMMOM_BLOCKS + [ FavoriteEnterprisesBlock, CommunitiesBlock, EnterprisesBlock ]
11 10 PERSON_BLOCKS_WITH_BLOG = PERSON_BLOCKS + [BlogArchivesBlock]
12 11  
13 12 ENTERPRISE_BLOCKS = COMMOM_BLOCKS + [DisabledEnterpriseMessageBlock, FeaturedProductsBlock, FansBlock, ProductCategoriesBlock]
... ...