Download as
Browse Code »

Commit d76b9e3bfc2c63c829e4c2ee85d405f9918a74d1

Authored by Antonio Terceiro
1 parent 18a99bd2
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

Don't crash if referenced image gallery is deleted 

(ActionItem1494)
Showing 2 changed files with 5 additions and 1 deletions   Show diff stats
app/models/slideshow_block.rb
  Diff comments   View file @d76b9e3
@@ -10,7 +10,7 @@ class SlideshowBlock < Block @@ -10,7 +10,7 @@ class SlideshowBlock < Block
10 end 10 end
11 11
12 def gallery 12 def gallery
13 - gallery_id ? Folder.find(gallery_id) : nil 13 + gallery_id ? Folder.find(:first, :conditions => { :id => gallery_id }) : nil
14 end 14 end
15 15
16 def block_images 16 def block_images
test/unit/slideshow_block_test.rb
  Diff comments   View file @d76b9e3
@@ -15,6 +15,10 @@ class SlideshowBlockTest < ActiveSupport::TestCase @@ -15,6 +15,10 @@ class SlideshowBlockTest < ActiveSupport::TestCase
15 assert_equal gallery, slideshow_block.gallery 15 assert_equal gallery, slideshow_block.gallery
16 end 16 end
17 17
  18 + should 'not crash if referencing unexisting folder' do
  19 + assert_nil SlideshowBlock.new(:gallery_id => -999).gallery
  20 + end
  21 +
18 should 'default interval between transitions is 4 seconds' do 22 should 'default interval between transitions is 4 seconds' do
19 slideshow = SlideshowBlock.new 23 slideshow = SlideshowBlock.new
20 assert_equal 4, slideshow.interval 24 assert_equal 4, slideshow.interval