Download as
Browse Code »

Commit 2508aeedee2ca744ddeb139d1b2e3436149404f8

Authored by Joenio Costa
1 parent 8f1693a8
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

Prevent crash when looking for lead in article without paragraphs 

(ActionItem1670)
Showing 2 changed files with 7 additions and 1 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @2508aee
@@ -342,7 +342,8 @@ class Article < ActiveRecord::Base @@ -342,7 +342,8 @@ class Article < ActiveRecord::Base
342 end 342 end
343 343
344 def first_paragraph 344 def first_paragraph
345 - Hpricot(to_html).search('p').first.to_html 345 + paragraphs = Hpricot(to_html).search('p')
  346 + paragraphs.empty? ? '' : paragraphs.first.to_html
346 end 347 end
347 348
348 def lead 349 def lead
test/unit/article_test.rb
  Diff comments   View file @2508aee
@@ -913,4 +913,9 @@ class ArticleTest < Test::Unit::TestCase @@ -913,4 +913,9 @@ class ArticleTest < Test::Unit::TestCase
913 assert_equal '<p>first</p>', a.lead 913 assert_equal '<p>first</p>', a.lead
914 end 914 end
915 915
  916 + should 'return blank as lead when article has no paragraphs' do
  917 + a = Article.new(:body => "<div>an article with content <em>but without</em> a paragraph</div>")
  918 + assert_equal '', a.lead
  919 + end
  920 +
916 end 921 end