Download as
Browse Code »

Commit c400ca46674ac04fea24c6b924a543319effd8d3

Authored by JoenioCosta
1 parent 87ba3ac3
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

ActionItem545: set EnterpriseHomepage as default homepage of enterprises 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2187 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 5 changed files with 23 additions and 2 deletions   Show diff stats
app/models/enterprise.rb
  Diff comments   View file @c400ca4
... ... @@ -66,4 +66,10 @@ class Enterprise < Organization
66 66 ]
67 67 end
68 68  
  69 + protected
  70 +
  71 + def default_homepage(attrs)
  72 + EnterpriseHomepage.new(attrs)
  73 + end
  74 +
69 75 end
... ...
app/models/profile.rb
  Diff comments   View file @c400ca4
... ... @@ -316,7 +316,7 @@ class Profile < ActiveRecord::Base
316 316  
317 317 after_create :insert_default_homepage_and_feed
318 318 def insert_default_homepage_and_feed
319   - hp = TinyMceArticle.new(:name => _("%s's home page") % self.name, :body => _("<p>This is a default homepage created for %s. It can be changed though the control panel.</p>") % self.name, :advertise => false)
  319 + hp = default_homepage(:name => _("%s's home page") % self.name, :body => _("<p>This is a default homepage created for %s. It can be changed though the control panel.</p>") % self.name, :advertise => false)
320 320 hp.profile = self
321 321 hp.save!
322 322 self.home_page = hp
... ... @@ -390,4 +390,8 @@ class Profile &lt; ActiveRecord::Base
390 390 !forbidden.include?(cat.class)
391 391 end
392 392  
  393 + def default_homepage(attrs)
  394 + TinyMceArticle.new(attrs)
  395 + end
  396 +
393 397 end
... ...
test/functional/environment_design_controller_test.rb
  Diff comments   View file @c400ca4
... ... @@ -29,7 +29,7 @@ class EnvironmentDesignControllerTest &lt; Test::Unit::TestCase
29 29  
30 30 should 'be able to edit LinkListBlock' do
31 31 login_as(create_admin_user(Environment.default))
32   - l = LinkListBlock.create!()
  32 + l = LinkListBlock.create!(:links => [{:name => 'link 1', :address => '/address_1'}])
33 33 Environment.default.boxes.create!
34 34 Environment.default.boxes.first.blocks << l
35 35 get :edit, :id => l.id
... ...
test/unit/enterprise_test.rb
  Diff comments   View file @c400ca4
... ... @@ -192,4 +192,10 @@ class EnterpriseTest &lt; Test::Unit::TestCase
192 192  
193 193 assert_equal [full_name], ent.product_categories
194 194 end
  195 +
  196 + should 'default home page is a EnterpriseHomepage' do
  197 + enterprise = Enterprise.create!(:name => 'my test enterprise', :identifier => 'myenterprise')
  198 + assert_kind_of EnterpriseHomepage, enterprise.home_page
  199 + end
  200 +
195 201 end
... ...
test/unit/profile_test.rb
  Diff comments   View file @c400ca4
... ... @@ -659,6 +659,11 @@ class ProfileTest &lt; Test::Unit::TestCase
659 659 assert_equal '', p.location
660 660 end
661 661  
  662 + should 'default home page is a TinyMceArticle' do
  663 + profile = Profile.create!(:identifier => 'newprofile', :name => 'New Profile')
  664 + assert_kind_of TinyMceArticle, profile.home_page
  665 + end
  666 +
662 667 private
663 668  
664 669 def assert_invalid_identifier(id)
... ...