Download as
Browse Code »

Commit b5af58d17debc3e57a2d6fc244d6d9e5af0c8f04

Authored by Rodrigo Souto
1 parent 15720094
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

[comments-refactor-review] Small refactor on content_viewer_helper

Showing 1 changed file with 3 additions and 8 deletions   Show diff stats
app/helpers/content_viewer_helper.rb
  Diff comments   View file @b5af58d
@@ -2,19 +2,14 @@ module ContentViewerHelper @@ -2,19 +2,14 @@ module ContentViewerHelper
2 2
3 include BlogHelper 3 include BlogHelper
4 include ForumHelper 4 include ForumHelper
5 -  
6 - def display_number_of_comments(n)  
7 - base_str = "<span class='comment-count hide'>#{n}</span>"  
8 5
  6 + def number_of_comments(article)
  7 + n = article.comments.without_spam.count
  8 + base_str = "<span class='comment-count hide'>#{n}</span>"
9 amount_str = n == 0 ? _('no comments yet') : (n == 1 ? _('One comment') : _('%s comments') % n) 9 amount_str = n == 0 ? _('no comments yet') : (n == 1 ? _('One comment') : _('%s comments') % n)
10 -  
11 base_str + "<span class='comment-count-write-out'>#{amount_str}</span>" 10 base_str + "<span class='comment-count-write-out'>#{amount_str}</span>"
12 end 11 end
13 12
14 - def number_of_comments(article)  
15 - display_number_of_comments(article.comments.without_spam.count)  
16 - end  
17 -  
18 def article_title(article, args = {}) 13 def article_title(article, args = {})
19 title = article.display_title if article.kind_of?(UploadedFile) && article.image? 14 title = article.display_title if article.kind_of?(UploadedFile) && article.image?
20 title = article.title if title.blank? 15 title = article.title if title.blank?