Download as
Browse Code »

Commit d250d0073bf7e67996d513e80c584a1985ff7a98

Authored by Daniela Feitosa
1 parent 650f72e7
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem1060: when applying template, copy title blocks

Showing 2 changed files with 29 additions and 1 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @d250d00
@@ -249,7 +249,7 @@ class Profile < ActiveRecord::Base @@ -249,7 +249,7 @@ class Profile < ActiveRecord::Base
249 profile.boxes.each do |box| 249 profile.boxes.each do |box|
250 self.boxes << Box.new(:position => box.position) 250 self.boxes << Box.new(:position => box.position)
251 box.blocks.each do |block| 251 box.blocks.each do |block|
252 - self.boxes[-1].blocks << block.class.new(:title => block.title, :settings => block.settings, :position => block.position) 252 + self.boxes[-1].blocks << block.class.new(:title => block[:title], :settings => block.settings, :position => block.position)
253 end 253 end
254 end 254 end
255 end 255 end
test/unit/profile_test.rb
  Diff comments   View file @d250d00
@@ -1090,6 +1090,34 @@ class ProfileTest &lt; Test::Unit::TestCase @@ -1090,6 +1090,34 @@ class ProfileTest &lt; Test::Unit::TestCase
1090 assert_equal 'some xyz article', Profile['test_profile'].home_page.name 1090 assert_equal 'some xyz article', Profile['test_profile'].home_page.name
1091 end 1091 end
1092 1092
  1093 + should 'not copy blocks default_title when applying template' do
  1094 + template = Profile.create!(:name => 'test template', :identifier => 'test_template')
  1095 + template.boxes.destroy_all
  1096 + template.boxes << Box.new
  1097 + b = Block.new()
  1098 + template.boxes[0].blocks << b
  1099 + p = Profile.create!(:name => 'test prof', :identifier => 'test_prof')
  1100 + assert b[:title].blank?
  1101 +
  1102 + p.copy_blocks_from(template)
  1103 +
  1104 + assert_nil p.boxes[0].blocks.first[:title]
  1105 + end
  1106 +
  1107 + should 'copy blocks title when applying template' do
  1108 + template = Profile.create!(:name => 'test template', :identifier => 'test_template')
  1109 + template.boxes.destroy_all
  1110 + template.boxes << Box.new
  1111 + b = Block.new(:title => 'default title')
  1112 + template.boxes[0].blocks << b
  1113 + p = Profile.create!(:name => 'test prof', :identifier => 'test_prof')
  1114 + assert !b[:title].blank?
  1115 +
  1116 + p.copy_blocks_from(template)
  1117 +
  1118 + assert_equal 'default title', p.boxes[0].blocks.first[:title]
  1119 + end
  1120 +
1093 TMP_THEMES_DIR = RAILS_ROOT + '/test/tmp/profile_themes' 1121 TMP_THEMES_DIR = RAILS_ROOT + '/test/tmp/profile_themes'
1094 should 'have themes' do 1122 should 'have themes' do
1095 Theme.stubs(:user_themes_dir).returns(TMP_THEMES_DIR) 1123 Theme.stubs(:user_themes_dir).returns(TMP_THEMES_DIR)