Download as
Browse Code »

Commit 764f2771d067dd1004eb8a9e6c1c744424683aab

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

clone-block: replace enabled=false by display=:never

Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
app/models/block.rb
  Diff comments   View file @764f277
@@ -170,7 +170,7 @@ class Block < ActiveRecord::Base @@ -170,7 +170,7 @@ class Block < ActiveRecord::Base
170 170
171 def duplicate 171 def duplicate
172 duplicated_block = self.clone 172 duplicated_block = self.clone
173 - duplicated_block.enabled = false 173 + duplicated_block.display = 'never'
174 duplicated_block.created_at = nil 174 duplicated_block.created_at = nil
175 duplicated_block.updated_at = nil 175 duplicated_block.updated_at = nil
176 duplicated_block.save! 176 duplicated_block.save!
test/unit/block_test.rb
  Diff comments   View file @764f277
@@ -2,7 +2,6 @@ require File.dirname(__FILE__) + '/../test_helper' @@ -2,7 +2,6 @@ require File.dirname(__FILE__) + '/../test_helper'
2 2
3 class BlockTest < ActiveSupport::TestCase 3 class BlockTest < ActiveSupport::TestCase
4 4
5 - DUPLICATABLE_FIELDS = [:settings, :title, :box_id, :type]  
6 5
7 should 'describe itself' do 6 should 'describe itself' do
8 assert_kind_of String, Block.description 7 assert_kind_of String, Block.description
@@ -179,9 +178,10 @@ class BlockTest &lt; ActiveSupport::TestCase @@ -179,9 +178,10 @@ class BlockTest &lt; ActiveSupport::TestCase
179 box = fast_create(Box, :owner_id => fast_create(Profile).id) 178 box = fast_create(Box, :owner_id => fast_create(Profile).id)
180 block = TagsBlock.create!(:title => 'test 1', :box_id => box.id, :settings => {:test => 'test'}) 179 block = TagsBlock.create!(:title => 'test 1', :box_id => box.id, :settings => {:test => 'test'})
181 duplicated = block.duplicate 180 duplicated = block.duplicate
182 - DUPLICATABLE_FIELDS.each do |f| 181 + [:title, :box_id, :type].each do |f|
183 assert_equal duplicated.send(f), block.send(f) 182 assert_equal duplicated.send(f), block.send(f)
184 end 183 end
  184 + assert 'test', duplicated[:settings][:test]
185 end 185 end
186 186
187 should 'clone block and set fields' do 187 should 'clone block and set fields' do
@@ -191,7 +191,7 @@ class BlockTest &lt; ActiveSupport::TestCase @@ -191,7 +191,7 @@ class BlockTest &lt; ActiveSupport::TestCase
191 duplicated = block.duplicate 191 duplicated = block.duplicate
192 block2.reload 192 block2.reload
193 block.reload 193 block.reload
194 - assert_equal false, duplicated.enabled 194 + assert_equal 'never', duplicated.display
195 assert_equal 1, block.position 195 assert_equal 1, block.position
196 assert_equal 2, duplicated.position 196 assert_equal 2, duplicated.position
197 assert_equal 3, block2.position 197 assert_equal 3, block2.position