From c400ca46674ac04fea24c6b924a543319effd8d3 Mon Sep 17 00:00:00 2001 From: JoenioCosta Date: Wed, 9 Jul 2008 20:14:37 +0000 Subject: [PATCH] ActionItem545: set EnterpriseHomepage as default homepage of enterprises --- app/models/enterprise.rb | 6 ++++++ app/models/profile.rb | 6 +++++- test/functional/environment_design_controller_test.rb | 2 +- test/unit/enterprise_test.rb | 6 ++++++ test/unit/profile_test.rb | 5 +++++ 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb index 8f3e089..a4b943d 100644 --- a/app/models/enterprise.rb +++ b/app/models/enterprise.rb @@ -66,4 +66,10 @@ class Enterprise < Organization ] end + protected + + def default_homepage(attrs) + EnterpriseHomepage.new(attrs) + end + end diff --git a/app/models/profile.rb b/app/models/profile.rb index 91d87a3..87a1e59 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -316,7 +316,7 @@ class Profile < ActiveRecord::Base after_create :insert_default_homepage_and_feed def insert_default_homepage_and_feed - hp = TinyMceArticle.new(:name => _("%s's home page") % self.name, :body => _("

This is a default homepage created for %s. It can be changed though the control panel.

") % self.name, :advertise => false) + hp = default_homepage(:name => _("%s's home page") % self.name, :body => _("

This is a default homepage created for %s. It can be changed though the control panel.

") % self.name, :advertise => false) hp.profile = self hp.save! self.home_page = hp @@ -390,4 +390,8 @@ class Profile < ActiveRecord::Base !forbidden.include?(cat.class) end + def default_homepage(attrs) + TinyMceArticle.new(attrs) + end + end diff --git a/test/functional/environment_design_controller_test.rb b/test/functional/environment_design_controller_test.rb index 8ac9b41..1e43cdb 100644 --- a/test/functional/environment_design_controller_test.rb +++ b/test/functional/environment_design_controller_test.rb @@ -29,7 +29,7 @@ class EnvironmentDesignControllerTest < Test::Unit::TestCase should 'be able to edit LinkListBlock' do login_as(create_admin_user(Environment.default)) - l = LinkListBlock.create!() + l = LinkListBlock.create!(:links => [{:name => 'link 1', :address => '/address_1'}]) Environment.default.boxes.create! Environment.default.boxes.first.blocks << l get :edit, :id => l.id diff --git a/test/unit/enterprise_test.rb b/test/unit/enterprise_test.rb index abc65c6..02904b9 100644 --- a/test/unit/enterprise_test.rb +++ b/test/unit/enterprise_test.rb @@ -192,4 +192,10 @@ class EnterpriseTest < Test::Unit::TestCase assert_equal [full_name], ent.product_categories end + + should 'default home page is a EnterpriseHomepage' do + enterprise = Enterprise.create!(:name => 'my test enterprise', :identifier => 'myenterprise') + assert_kind_of EnterpriseHomepage, enterprise.home_page + end + end diff --git a/test/unit/profile_test.rb b/test/unit/profile_test.rb index bfb512a..aa421b0 100644 --- a/test/unit/profile_test.rb +++ b/test/unit/profile_test.rb @@ -659,6 +659,11 @@ class ProfileTest < Test::Unit::TestCase assert_equal '', p.location end + should 'default home page is a TinyMceArticle' do + profile = Profile.create!(:identifier => 'newprofile', :name => 'New Profile') + assert_kind_of TinyMceArticle, profile.home_page + end + private def assert_invalid_identifier(id) -- libgit2 0.21.2