Download as
Browse Code »

Commit 0c5034f4ce290e0aae56718aa95a9d4ea01b1ef4

Authored by Rodrigo Souto
1 parent ab4f0e6b
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

[template-welcome-page] Move welcome page logic to profile

Showing 2 changed files with 26 additions and 0 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @0c5034f
@@ -143,6 +143,10 @@ class Profile < ActiveRecord::Base @@ -143,6 +143,10 @@ class Profile < ActiveRecord::Base
143 # welcome_page... =P 143 # welcome_page... =P
144 belongs_to :welcome_page, :class_name => 'Article', :dependent => :destroy 144 belongs_to :welcome_page, :class_name => 'Article', :dependent => :destroy
145 145
  146 + def welcome_page_content
  147 + welcome_page && welcome_page.published ? welcome_page.body : nil
  148 + end
  149 +
146 def scraps(scrap=nil) 150 def scraps(scrap=nil)
147 scrap = scrap.is_a?(Scrap) ? scrap.id : scrap 151 scrap = scrap.is_a?(Scrap) ? scrap.id : scrap
148 scrap.nil? ? Scrap.all_scraps(self) : Scrap.all_scraps(self).find(scrap) 152 scrap.nil? ? Scrap.all_scraps(self) : Scrap.all_scraps(self).find(scrap)
test/unit/profile_test.rb
  Diff comments   View file @0c5034f
@@ -1965,4 +1965,26 @@ class ProfileTest < ActiveSupport::TestCase @@ -1965,4 +1965,26 @@ class ProfileTest < ActiveSupport::TestCase
1965 welcome_page = fast_create(TinyMceArticle, :slug => 'welcome-page', :profile_id => template.id) 1965 welcome_page = fast_create(TinyMceArticle, :slug => 'welcome-page', :profile_id => template.id)
1966 assert !template.copy_article?(welcome_page) 1966 assert !template.copy_article?(welcome_page)
1967 end 1967 end
  1968 +
  1969 + should 'return nil on welcome_page_content if template has no welcome page' do
  1970 + template = fast_create(Profile, :is_template => true)
  1971 + assert_nil template.welcome_page_content
  1972 + end
  1973 +
  1974 + should 'return nil on welcome_page_content if content is not published' do
  1975 + template = fast_create(Profile, :is_template => true)
  1976 + welcome_page = fast_create(TinyMceArticle, :slug => 'welcome-page', :profile_id => template.id, :body => 'Template welcome page', :published => false)
  1977 + template.welcome_page = welcome_page
  1978 + template.save!
  1979 + assert_nil template.welcome_page_content
  1980 + end
  1981 +
  1982 + should 'return template welcome page content on welcome_page_content if content is published' do
  1983 + template = fast_create(Profile, :is_template => true)
  1984 + body = 'Template welcome page'
  1985 + welcome_page = fast_create(TinyMceArticle, :slug => 'welcome-page', :profile_id => template.id, :body => body, :published => true)
  1986 + template.welcome_page = welcome_page
  1987 + template.save!
  1988 + assert_equal body, template.welcome_page_content
  1989 + end
1968 end 1990 end