Download as
Browse Code »

Commit 74a61295d8e5bda43670d2cc283b0fe473b69929

Authored by Luciano Prestes
1 parent 5f1ce128
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

Fix highlights_block error on add Noosfero.root 

Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com>
Showing 2 changed files with 16 additions and 1 deletions   Show diff stats
app/models/highlights_block.rb
  Diff comments   View file @74a6129
@@ -12,7 +12,9 @@ class HighlightsBlock &lt; Block @@ -12,7 +12,9 @@ class HighlightsBlock &lt; Block
12 block.images.each do |i| 12 block.images.each do |i|
13 i[:image_id] = i[:image_id].to_i 13 i[:image_id] = i[:image_id].to_i
14 i[:position] = i[:position].to_i 14 i[:position] = i[:position].to_i
15 - i[:address] = Noosfero.root + i[:address] unless Noosfero.root.nil? 15 + if !Noosfero.root.nil? and !i[:address].start_with?(Noosfero.root + '/')
  16 + i[:address] = Noosfero.root + i[:address]
  17 + end
16 begin 18 begin
17 file = UploadedFile.find(i[:image_id]) 19 file = UploadedFile.find(i[:image_id])
18 i[:image_src] = file.public_filename 20 i[:image_src] = file.public_filename
test/unit/highlights_block_test.rb
  Diff comments   View file @74a6129
@@ -132,6 +132,19 @@ class HighlightsBlockTest &lt; ActiveSupport::TestCase @@ -132,6 +132,19 @@ class HighlightsBlockTest &lt; ActiveSupport::TestCase
132 assert_equal block.images.first[:address], "/social/address" 132 assert_equal block.images.first[:address], "/social/address"
133 end 133 end
134 134
  135 + should 'not duplicate sub-dir address before save' do
  136 + Noosfero.stubs(:root).returns("/social")
  137 + f1 = mock()
  138 + f1.expects(:public_filename).returns('address')
  139 + UploadedFile.expects(:find).with(1).returns(f1)
  140 + block = HighlightsBlock.new
  141 + i1 = {:image_id => 1, :address => '/social/address', :position => 3, :title => 'address'}
  142 + block.images = [i1]
  143 + block.save!
  144 + block.reload
  145 + assert_equal block.images.first[:address], "/social/address"
  146 + end
  147 +
135 should 'display images with subdir src' do 148 should 'display images with subdir src' do
136 Noosfero.stubs(:root).returns("/social") 149 Noosfero.stubs(:root).returns("/social")
137 f1 = mock() 150 f1 = mock()