Download as
Browse Code »

Commit 0af76ab383924eb64d48cb9963462c932b9cca09

Authored by AntonioTerceiro
1 parent b2673656
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem231: fixed reference to unexisting (e.g. removed) article. 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1614 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 30 additions and 1 deletions   Show diff stats
app/models/article_block.rb
  Diff comments   View file @0af76ab
@@ -19,7 +19,14 @@ class ArticleBlock < Block @@ -19,7 +19,14 @@ class ArticleBlock < Block
19 def article(reload = false) 19 def article(reload = false)
20 @article = nil if reload 20 @article = nil if reload
21 if @article || article_id 21 if @article || article_id
22 - @article = Article.find(article_id) 22 + begin
  23 + @article = Article.find(article_id)
  24 + rescue ActiveRecord::RecordNotFound
  25 + # dangling reference, clear it
  26 + @article = nil
  27 + self.article_id = nil
  28 + self.save!
  29 + end
23 end 30 end
24 @article 31 @article
25 end 32 end
test/unit/article_block_test.rb
  Diff comments   View file @0af76ab
@@ -30,4 +30,26 @@ class ArticleBlockTest < Test::Unit::TestCase @@ -30,4 +30,26 @@ class ArticleBlockTest < Test::Unit::TestCase
30 30
31 end 31 end
32 32
  33 + should 'not crash when referenced article is removed' do
  34 + person = create_user('testuser').person
  35 + a = person.articles.create!(:name => 'test')
  36 + block = ArticleBlock.create(:article => a)
  37 + person.boxes.first.blocks << block
  38 + block.save!
  39 +
  40 + a.destroy
  41 + block.reload
  42 + assert_nil block.article
  43 + end
  44 +
  45 + should 'nullify reference to unexisting article' do
  46 + Article.delete_all
  47 +
  48 + block = ArticleBlock.new
  49 + block.article_id = 999
  50 +
  51 + block.article
  52 + assert_nil block.article_id
  53 + end
  54 +
33 end 55 end