From d76b9e3bfc2c63c829e4c2ee85d405f9918a74d1 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Mon, 26 Apr 2010 11:34:53 -0300 Subject: [PATCH] Don't crash if referenced image gallery is deleted --- app/models/slideshow_block.rb | 2 +- test/unit/slideshow_block_test.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/slideshow_block.rb b/app/models/slideshow_block.rb index 95f6ddd..a34adbb 100644 --- a/app/models/slideshow_block.rb +++ b/app/models/slideshow_block.rb @@ -10,7 +10,7 @@ class SlideshowBlock < Block end def gallery - gallery_id ? Folder.find(gallery_id) : nil + gallery_id ? Folder.find(:first, :conditions => { :id => gallery_id }) : nil end def block_images diff --git a/test/unit/slideshow_block_test.rb b/test/unit/slideshow_block_test.rb index 9e04c06..32367bf 100644 --- a/test/unit/slideshow_block_test.rb +++ b/test/unit/slideshow_block_test.rb @@ -15,6 +15,10 @@ class SlideshowBlockTest < ActiveSupport::TestCase assert_equal gallery, slideshow_block.gallery end + should 'not crash if referencing unexisting folder' do + assert_nil SlideshowBlock.new(:gallery_id => -999).gallery + end + should 'default interval between transitions is 4 seconds' do slideshow = SlideshowBlock.new assert_equal 4, slideshow.interval -- libgit2 0.21.2