Download as
Browse Code »

Commit ae10999133cfb9aa46c40cabaec0a941ee5e7644

Authored by AntonioTerceiro
1 parent 3d57165a
Exists in master and in 28 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, stable, temp_ratings, tests, tests_fixies

ActionItem154: adding default blocks for enterprise 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1370 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 28 additions and 14 deletions   Show diff stats
app/models/community.rb
  Diff comments   View file @ae10999
@@ -14,18 +14,4 @@ class Community < Organization @@ -14,18 +14,4 @@ class Community < Organization
14 self.affiliate(person, Profile::Roles.member) 14 self.affiliate(person, Profile::Roles.member)
15 end 15 end
16 16
17 - after_create :create_default_set_of_blocks_for_community  
18 - def create_default_set_of_blocks_for_community  
19 - # "main" area  
20 - # nothing ...  
21 -  
22 - # "left" area  
23 - self.boxes[1].blocks << ProfileInfoBlock.new  
24 - self.boxes[1].blocks << RecentDocumentsBlock.new  
25 -  
26 - # "right" area  
27 - self.boxes[2].blocks << MembersBlock.new  
28 - self.boxes[2].blocks << TagsBlock.new  
29 - end  
30 -  
31 end 17 end
app/models/organization.rb
  Diff comments   View file @ae10999
@@ -53,4 +53,18 @@ class Organization &lt; Profile @@ -53,4 +53,18 @@ class Organization &lt; Profile
53 true 53 true
54 end 54 end
55 55
  56 + after_create :create_default_set_of_blocks_for_organization
  57 + def create_default_set_of_blocks_for_organization
  58 + # "main" area
  59 + # nothing ..., MainBlock is already there
  60 +
  61 + # "left" area
  62 + self.boxes[1].blocks << ProfileInfoBlock.new
  63 + self.boxes[1].blocks << RecentDocumentsBlock.new
  64 +
  65 + # "right" area
  66 + self.boxes[2].blocks << MembersBlock.new
  67 + self.boxes[2].blocks << TagsBlock.new
  68 + end
  69 +
56 end 70 end
test/unit/enterprise_test.rb
  Diff comments   View file @ae10999
@@ -62,4 +62,18 @@ class EnterpriseTest &lt; Test::Unit::TestCase @@ -62,4 +62,18 @@ class EnterpriseTest &lt; Test::Unit::TestCase
62 assert_kind_of RssFeed, enterprise.articles.find_by_path('feed') 62 assert_kind_of RssFeed, enterprise.articles.find_by_path('feed')
63 end 63 end
64 64
  65 + should 'create default set of blocks' do
  66 + e = Enterprise.create!(:name => 'my new community', :identifier => 'mynewcommunity')
  67 +
  68 + assert e.boxes[0].blocks.map(&:class).include?(MainBlock), 'enterprise must have a MainBlock upon creation'
  69 +
  70 + assert e.boxes[1].blocks.map(&:class).include?(ProfileInfoBlock), 'enterprise must have a ProfileInfoBlock upon creation'
  71 + assert e.boxes[1].blocks.map(&:class).include?(RecentDocumentsBlock), 'enterprise must have a RecentDocumentsBlock upon creation'
  72 +
  73 + assert e.boxes[2].blocks.map(&:class).include?(MembersBlock), 'enterprise must have a MembersBlock upon creation'
  74 + assert e.boxes[2].blocks.map(&:class).include?(TagsBlock), 'enterprise must have a TagsBlock upon creation'
  75 +
  76 + assert_equal 5, e.blocks.size
  77 + end
  78 +
65 end 79 end